vcl: rename Window::Notify to EventNotify

There is annoying overloading between Window::Notify and
SfxListener::Notify, and the Window one has apparently fewer
implementations, so rename that and remove lots of disambiguating
"using Notify" in multiply inheriting classes.

Change-Id: I8b597fd9e70cf2e7103b9dfa7cc666e79e7aff49
(cherry picked from commit 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7)
(cherry picked from commit 03bfafb36107d18c0cccf53efdd550c0b7a81b8f)

20 files changed, 64 insertions, 64 deletions

diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index a589c72fdaa1..8003fd7cd145 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -373,7 +373,7 @@ protected:
     virtual void        GetFocus() override;
     virtual void        StateChanged( StateChangedType nType ) override;
 
-    virtual bool        Notify( NotifyEvent& rNEvt ) override;
+    virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
 
     void                ImplResizeControls();
     void                ImplCheckScrollBars();
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 1bd24ac1f068..8177cc805d00 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -166,7 +166,7 @@ public:
     {
         return false;
     }
-    virtual bool Notify( NotifyEvent& ) override
+    virtual bool EventNotify( NotifyEvent& ) override
     {
         return false;
     }
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 1856ff4eac2f..ef5686fc50ef 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -694,7 +694,7 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-bool ComboBox::Notify( NotifyEvent& rNEvt )
+bool ComboBox::EventNotify( NotifyEvent& rNEvt )
 {
     bool bDone = false;
     if ((rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
@@ -780,7 +780,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
         m_pImpl->m_pSubEdit->GrabFocus();
     }
 
-    return bDone || Edit::Notify( rNEvt );
+    return bDone || Edit::EventNotify( rNEvt );
 }
 
 void ComboBox::SetText( const OUString& rStr )
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 6a718e965604..15c3a4ea61cf 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -228,7 +228,7 @@ OUString Control::GetDisplayText() const
     return mpControlData->mpLayoutData ? OUString(mpControlData->mpLayoutData->m_aDisplayText) : GetText();
 }
 
-bool Control::Notify( NotifyEvent& rNEvt )
+bool Control::EventNotify( NotifyEvent& rNEvt )
 {
     // tdf#91081 if control is not valid, skip the emission - chaining to the parent
     if (mpControlData)
@@ -260,7 +260,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
             }
         }
     }
-    return Window::Notify( rNEvt );
+    return Window::EventNotify( rNEvt );
 }
 
 void Control::StateChanged( StateChangedType nStateChange )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 308cd43161c1..50c83c1b20d8 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -784,7 +784,7 @@ bool NumericField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-bool NumericField::Notify( NotifyEvent& rNEvt )
+bool NumericField::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -794,7 +794,7 @@ bool NumericField::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void NumericField::DataChanged( const DataChangedEvent& rDCEvt )
@@ -923,7 +923,7 @@ bool NumericBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-bool NumericBox::Notify( NotifyEvent& rNEvt )
+bool NumericBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -933,7 +933,7 @@ bool NumericBox::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return ComboBox::Notify( rNEvt );
+    return ComboBox::EventNotify( rNEvt );
 }
 
 void NumericBox::DataChanged( const DataChangedEvent& rDCEvt )
@@ -1604,7 +1604,7 @@ bool MetricField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-bool MetricField::Notify( NotifyEvent& rNEvt )
+bool MetricField::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -1614,7 +1614,7 @@ bool MetricField::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void MetricField::DataChanged( const DataChangedEvent& rDCEvt )
@@ -1707,7 +1707,7 @@ bool MetricBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-bool MetricBox::Notify( NotifyEvent& rNEvt )
+bool MetricBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -1717,7 +1717,7 @@ bool MetricBox::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return ComboBox::Notify( rNEvt );
+    return ComboBox::EventNotify( rNEvt );
 }
 
 void MetricBox::DataChanged( const DataChangedEvent& rDCEvt )
@@ -1919,7 +1919,7 @@ bool CurrencyField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-bool CurrencyField::Notify( NotifyEvent& rNEvt )
+bool CurrencyField::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -1929,7 +1929,7 @@ bool CurrencyField::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void CurrencyField::DataChanged( const DataChangedEvent& rDCEvt )
@@ -2003,7 +2003,7 @@ bool CurrencyBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-bool CurrencyBox::Notify( NotifyEvent& rNEvt )
+bool CurrencyBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -2013,7 +2013,7 @@ bool CurrencyBox::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return ComboBox::Notify( rNEvt );
+    return ComboBox::EventNotify( rNEvt );
 }
 
 void CurrencyBox::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 499babec1d17..2cb03cf61973 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -846,7 +846,7 @@ bool PatternField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-bool PatternField::Notify( NotifyEvent& rNEvt )
+bool PatternField::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -856,7 +856,7 @@ bool PatternField::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void PatternField::Modify()
@@ -898,7 +898,7 @@ bool PatternBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-bool PatternBox::Notify( NotifyEvent& rNEvt )
+bool PatternBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -908,7 +908,7 @@ bool PatternBox::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return ComboBox::Notify( rNEvt );
+    return ComboBox::EventNotify( rNEvt );
 }
 
 void PatternBox::Modify()
@@ -1750,7 +1750,7 @@ bool DateField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-bool DateField::Notify( NotifyEvent& rNEvt )
+bool DateField::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -1783,7 +1783,7 @@ bool DateField::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void DateField::DataChanged( const DataChangedEvent& rDCEvt )
@@ -1867,7 +1867,7 @@ void DateBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-bool DateBox::Notify( NotifyEvent& rNEvt )
+bool DateBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -1886,7 +1886,7 @@ bool DateBox::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return ComboBox::Notify( rNEvt );
+    return ComboBox::EventNotify( rNEvt );
 }
 
 void DateBox::Modify()
@@ -2531,7 +2531,7 @@ bool TimeField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-bool TimeField::Notify( NotifyEvent& rNEvt )
+bool TimeField::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -2552,7 +2552,7 @@ bool TimeField::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void TimeField::DataChanged( const DataChangedEvent& rDCEvt )
@@ -2674,7 +2674,7 @@ bool TimeBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-bool TimeBox::Notify( NotifyEvent& rNEvt )
+bool TimeBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         MarkToBeReformatted( false );
@@ -2684,7 +2684,7 @@ bool TimeBox::Notify( NotifyEvent& rNEvt )
             Reformat();
     }
 
-    return ComboBox::Notify( rNEvt );
+    return ComboBox::EventNotify( rNEvt );
 }
 
 void TimeBox::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 5031cdf790b7..25c7fa2c5b5b 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2466,7 +2466,7 @@ void ImplListBox::StateChanged( StateChangedType nType )
     Control::StateChanged( nType );
 }
 
-bool ImplListBox::Notify( NotifyEvent& rNEvt )
+bool ImplListBox::EventNotify( NotifyEvent& rNEvt )
 {
     bool bDone = false;
     if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
@@ -2482,7 +2482,7 @@ bool ImplListBox::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return bDone || Window::Notify( rNEvt );
+    return bDone || Window::EventNotify( rNEvt );
 }
 
 const Wallpaper& ImplListBox::GetDisplayBackground() const
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index bba05bcfd86b..33ba8ad74916 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -459,7 +459,7 @@ bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-bool LongCurrencyField::Notify( NotifyEvent& rNEvt )
+bool LongCurrencyField::EventNotify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
     {
@@ -473,7 +473,7 @@ bool LongCurrencyField::Notify( NotifyEvent& rNEvt )
             SpinField::Modify();
         }
     }
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void LongCurrencyField::Modify()
@@ -533,7 +533,7 @@ bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-bool LongCurrencyBox::Notify( NotifyEvent& rNEvt )
+bool LongCurrencyBox::EventNotify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
     {
@@ -547,7 +547,7 @@ bool LongCurrencyBox::Notify( NotifyEvent& rNEvt )
             ComboBox::Modify();
         }
     }
-    return ComboBox::Notify( rNEvt );
+    return ComboBox::EventNotify( rNEvt );
 }
 
 void LongCurrencyBox::Modify()
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 01fb8a393e64..b5f659e5be10 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -489,7 +489,7 @@ void SpinField::MouseMove(const MouseEvent& rMEvt)
     Edit::MouseMove(rMEvt);
 }
 
-bool SpinField::Notify(NotifyEvent& rNEvt)
+bool SpinField::EventNotify(NotifyEvent& rNEvt)
 {
     bool bDone = false;
     if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
@@ -569,7 +569,7 @@ bool SpinField::Notify(NotifyEvent& rNEvt)
         }
     }
 
-    return bDone || Edit::Notify(rNEvt);
+    return bDone || Edit::EventNotify(rNEvt);
 }
 
 void SpinField::FillLayoutData() const
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index df611dc92ab2..d53dbdda89cc 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1586,14 +1586,14 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt )
     return Control::PreNotify(rNEvt);
 }
 
-bool TabControl::Notify( NotifyEvent& rNEvt )
+bool TabControl::EventNotify( NotifyEvent& rNEvt )
 {
     bool bRet = false;
 
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
         bRet = ImplHandleKeyEvent( *rNEvt.GetKeyEvent() );
 
-    return bRet || Control::Notify( rNEvt );
+    return bRet || Control::EventNotify( rNEvt );
 }
 
 void TabControl::ActivatePage()
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 38c72c6015e9..1b38fc55d8ce 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1433,14 +1433,14 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size&
     pDev->Pop();
 }
 
-bool VclMultiLineEdit::Notify( NotifyEvent& rNEvt )
+bool VclMultiLineEdit::EventNotify( NotifyEvent& rNEvt )
 {
     bool bDone = false;
     if( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
     {
         bDone = pImpVclMEdit->HandleCommand( *rNEvt.GetCommandEvent() );
     }
-    return bDone || Edit::Notify( rNEvt );
+    return bDone || Edit::EventNotify( rNEvt );
 }
 
 bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 8c352218d798..d1ce491d490a 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -603,10 +603,10 @@ IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl, void*, void)
     Close();
 }
 
-bool Dialog::Notify( NotifyEvent& rNEvt )
+bool Dialog::EventNotify( NotifyEvent& rNEvt )
 {
     // first call the base class due to Tab control
-    bool bRet = SystemWindow::Notify( rNEvt );
+    bool bRet = SystemWindow::EventNotify( rNEvt );
     if ( !bRet )
     {
         if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 836ea9880e71..4b0be238694f 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -520,10 +520,10 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-bool DockingWindow::Notify( NotifyEvent& rNEvt )
+bool DockingWindow::EventNotify( NotifyEvent& rNEvt )
 {
     if( GetDockingManager()->IsDockable( this ) )   // new docking interface
-        return Window::Notify( rNEvt );
+        return Window::EventNotify( rNEvt );
 
     if ( mbDockable )
     {
@@ -571,7 +571,7 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return Window::Notify( rNEvt );
+    return Window::EventNotify( rNEvt );
 }
 
 void DockingWindow::StartDocking()
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 8021c074c549..54997dda317d 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -91,7 +91,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
     return bDone;
 }
 
-bool Window::Notify( NotifyEvent& rNEvt )
+bool Window::EventNotify( NotifyEvent& rNEvt )
 {
     bool bRet = false;
 
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 3ee264fad5ad..ccbc580fdc8d 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -567,10 +567,10 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl, void*, void)
     PopupModeEnd();
 }
 
-bool FloatingWindow::Notify( NotifyEvent& rNEvt )
+bool FloatingWindow::EventNotify( NotifyEvent& rNEvt )
 {
     // call Base Class first for tab control
-    bool bRet = SystemWindow::Notify( rNEvt );
+    bool bRet = SystemWindow::EventNotify( rNEvt );
     if ( !bRet )
     {
         if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5f921c2b5da8..a0e0002c57be 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2012,7 +2012,7 @@ bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue)
     return bRet;
 }
 
-bool VclScrolledWindow::Notify(NotifyEvent& rNEvt)
+bool VclScrolledWindow::EventNotify(NotifyEvent& rNEvt)
 {
     bool bDone = false;
     if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
@@ -2028,7 +2028,7 @@ bool VclScrolledWindow::Notify(NotifyEvent& rNEvt)
         }
     }
 
-    return bDone || VclBin::Notify( rNEvt );
+    return bDone || VclBin::EventNotify( rNEvt );
 }
 
 void VclViewport::setAllocation(const Size &rAllocation)
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index a2a214b019e4..467bc089e388 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -413,21 +413,21 @@ void Window::ImplGrabFocusToDocument( GetFocusFlags nFlags )
 void Window::MouseMove( const MouseEvent& rMEvt )
 {
     NotifyEvent aNEvt( MouseNotifyEvent::MOUSEMOVE, this, &rMEvt );
-    if ( !Notify( aNEvt ) )
+    if (!EventNotify(aNEvt))
         mpWindowImpl->mbMouseMove = true;
 }
 
 void Window::MouseButtonDown( const MouseEvent& rMEvt )
 {
     NotifyEvent aNEvt( MouseNotifyEvent::MOUSEBUTTONDOWN, this, &rMEvt );
-    if ( !Notify( aNEvt ) )
+    if (!EventNotify(aNEvt))
         mpWindowImpl->mbMouseButtonDown = true;
 }
 
 void Window::MouseButtonUp( const MouseEvent& rMEvt )
 {
     NotifyEvent aNEvt( MouseNotifyEvent::MOUSEBUTTONUP, this, &rMEvt );
-    if ( !Notify( aNEvt ) )
+    if (!EventNotify(aNEvt))
         mpWindowImpl->mbMouseButtonUp = true;
 }
 
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index bb834906af03..f5650b291be8 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -170,7 +170,7 @@ bool Accelerator::ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::W
     return false;
 }
 
-bool SystemWindow::Notify( NotifyEvent& rNEvt )
+bool SystemWindow::EventNotify( NotifyEvent& rNEvt )
 {
     if (rNEvt.GetType() == MouseNotifyEvent::COMMAND)
         Accelerator::ToggleMnemonicsOnHierarchy(*rNEvt.GetCommandEvent(), this);
@@ -198,7 +198,7 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt )
             return true;
     }
 
-    return Window::Notify( rNEvt );
+    return Window::EventNotify( rNEvt );
 }
 
 bool SystemWindow::PreNotify( NotifyEvent& rNEvt )
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index de2716a8e4a0..7c5d2a976e06 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4307,7 +4307,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt )
     DockingWindow::RequestHelp( rHEvt );
 }
 
-bool ToolBox::Notify( NotifyEvent& rNEvt )
+bool ToolBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
@@ -4327,11 +4327,11 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
                 bool bNoTabCycling = bOldSchoolContainer || isContainerWindow(pParent);
 
                 if( bNoTabCycling &&  ! (GetStyle() & WB_FORCETABCYCLE) )
-                    return DockingWindow::Notify( rNEvt );
+                    return DockingWindow::EventNotify( rNEvt );
                 else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() , bNoTabCycling ) )
                     return false;
                 else
-                    return DockingWindow::Notify( rNEvt );
+                    return DockingWindow::EventNotify( rNEvt );
             }
             default:
                 break;
@@ -4376,7 +4376,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
 
                 ++it;
             }
-            return DockingWindow::Notify( rNEvt );
+            return DockingWindow::EventNotify( rNEvt );
         }
     }
     else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
@@ -4387,7 +4387,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
         mnCurPos = TOOLBOX_ITEM_NOTFOUND;
     }
 
-    return DockingWindow::Notify( rNEvt );
+    return DockingWindow::EventNotify( rNEvt );
 }
 
 void ToolBox::Command( const CommandEvent& rCEvt )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 48ebe460ba04..7c1591c42a06 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3873,9 +3873,9 @@ bool Window::CompatPreNotify( NotifyEvent& rNEvt )
 bool Window::CompatNotify( NotifyEvent& rNEvt )
 {
     if (!mpWindowImpl || mpWindowImpl->mbInDispose)
-        return Window::Notify( rNEvt );
+        return Window::EventNotify( rNEvt );
     else
-        return Notify( rNEvt );
+        return EventNotify( rNEvt );
 }
 
 void Window::set_id(const OUString& rID)