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)

31 files changed, 46 insertions, 47 deletions

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index b16aec1bd83d..88b20c6d87a1 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -104,7 +104,7 @@ protected:
 public:
     virtual void            FillInfo(SfxChildWinInfo&) const;
     void                    Initialize (SfxChildWinInfo* pInfo);
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     SfxBindings&            GetBindings()
                             { return *pBindings; }
 
@@ -140,7 +140,7 @@ protected:
     virtual bool            Close() override;
     virtual void            Resize() override;
     virtual void            Move() override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     SfxBindings&            GetBindings()
                             { return *pBindings; }
 
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 29063e799caa..cadc84000ab1 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -98,7 +98,7 @@ public:
 
     void                SetMinOutputSizePixel( const Size& rSize );
     const Size&         GetMinOutputSizePixel() const;
-    virtual bool        Notify( NotifyEvent& rNEvt ) override;
+    virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
     DECL_LINK(TimerHdl, Idle *, void);
 
     SAL_DLLPRIVATE void Initialize_Impl();
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 8df11c89ac39..adc57e74047b 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -47,7 +47,7 @@ public:
     virtual void            dispose() override;
 
     virtual short           Execute() override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
 
     const SfxItemSet&       GetOptions() const { return *pOptions; }
     void                    DisableHelp();
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 8eb06e5b0b9c..cdd58b20aea5 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -65,7 +65,7 @@ public:
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
     virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override;
     virtual void DataChanged (const DataChangedEvent& rEvent) override;
-    virtual bool Notify(NotifyEvent& rEvent) override;
+    virtual bool EventNotify(NotifyEvent& rEvent) override;
 
     static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation);
 
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index e36f6c6c9a75..19d923d34a49 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -52,7 +52,7 @@ public:
             const Size& rRequestedSize,
             sal_uInt16 nPos = TOOLBOX_APPEND) override;
 
-    virtual bool Notify (NotifyEvent& rEvent) override;
+    virtual bool EventNotify(NotifyEvent& rEvent) override;
 
     void SetController(const sal_uInt16 nItemId,
                        const css::uno::Reference<css::frame::XToolbarController>& rxController);
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 5ea6a946e17b..df4b0c01983e 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -77,7 +77,7 @@ public:
 
     virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override;
     virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) override;
-    virtual bool Notify (NotifyEvent& rEvent) override;
+    virtual bool EventNotify (NotifyEvent& rEvent) override;
 
     static sal_Int32 GetDefaultWidth();
 
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index ab2679cba27e..e31bcf0d5f8b 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -524,7 +524,7 @@ namespace svt
         using BrowseBox::MouseButtonDown;
 
         virtual bool PreNotify(NotifyEvent& rNEvt ) override;
-        virtual bool Notify(NotifyEvent& rNEvt) override;
+        virtual bool EventNotify(NotifyEvent& rNEvt) override;
 
         virtual void EndScroll() override;
 
diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx
index 5c9cc0dbf0fc..584b1daeebd2 100644
--- a/include/svtools/fileurlbox.hxx
+++ b/include/svtools/fileurlbox.hxx
@@ -40,7 +40,7 @@ namespace svt
 
     protected:
         virtual bool        PreNotify( NotifyEvent& rNEvt ) override;
-        virtual bool        Notify( NotifyEvent& rNEvt ) override;
+        virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
 
     public:
         /** transforms the given URL content into a system-dependent notation, if possible, and
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index bce4e6397467..f59389c2de35 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -226,7 +226,7 @@ public:
     bool    IsUsingInputStringForFormatting() const { return m_bUseInputStringForFormatting;}
 
 protected:
-    virtual bool Notify(NotifyEvent& rNEvt) override;
+    virtual bool EventNotify(NotifyEvent& rNEvt) override;
     void impl_Modify(bool makeValueDirty = true);
     virtual void Modify() override;
 
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 46b22333bb7a..0954185138ba 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -52,7 +52,7 @@ friend class SvtURLBox_Impl;
     SVT_DLLPRIVATE void             Init(bool bSetDefaultHelpID);
 
 protected:
-    virtual bool                    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool                    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void                    Select() override;
     virtual bool                    PreNotify( NotifyEvent& rNEvt ) override;
 
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 33b8cff77206..383c718bd97a 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -62,7 +62,7 @@ public:
     Printer*        GetPrinter() const { return mpPrinter; }
 
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     virtual short   Execute() override;
 
diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx
index e97d6d8fba04..cdc830b2ef8b 100644
--- a/include/svtools/urlcontrol.hxx
+++ b/include/svtools/urlcontrol.hxx
@@ -40,7 +40,7 @@ namespace svt
 
     protected:
         virtual bool        PreNotify( NotifyEvent& rNEvt ) override;
-        virtual bool        Notify( NotifyEvent& rNEvt ) override;
+        virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
     };
 
 
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 39b9d3f1dee0..9f9ffe177738 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -235,7 +235,7 @@ public:
 
     virtual void        Resize() override;
     virtual void        StateChanged( StateChangedType nStateChange ) override;
-    virtual bool        Notify( NotifyEvent& rNEvt ) override;
+    virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
 
     virtual void        ActivatePage();
     virtual bool        DeactivatePage();
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index 03ba6c97133c..c3b8eaf18b86 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -107,7 +107,7 @@ public:
 
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 };
 
 #endif
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index f992be48ec1b..0dbba2e42aee 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -54,7 +54,7 @@ public:
 protected:
     virtual void    Select() override;
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 };
@@ -76,7 +76,7 @@ protected:
     virtual void    Modify() override;
 
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 public:
@@ -100,7 +100,7 @@ public:
 
 protected:
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
 private:
     sal_uInt16      nCurPos;
@@ -119,7 +119,7 @@ public:
 
 protected:
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
 private:
     sal_uInt16      nCurPos;
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index f8ba4cea149f..1ca1c209ef13 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -83,7 +83,6 @@ namespace o3tl
 class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
 {
     friend class SvxRulerItem;
-    using Window::Notify;
 
     std::vector<std::unique_ptr<SvxRulerItem> > pCtrlItems;
 
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index ca4086f6bfd1..7492b887d41f 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -39,7 +39,7 @@ public:
     virtual Size GetOptimalSize() const override;
     virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override;
     virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override;
-    virtual bool Notify(NotifyEvent& rNEvt) override;
+    virtual bool EventNotify(NotifyEvent& rNEvt) override;
 };
 
 #endif
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 07f54271a880..6796975cc61a 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -58,7 +58,7 @@ public:
 
     virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override;
     virtual void    Resize() override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    StateChanged( StateChangedType nType ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index bfefd99b4876..c9768a653a50 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -133,7 +133,7 @@ public:
 
     virtual void    EnableRTL ( bool bEnable = true ) override;
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    StateChanged( StateChangedType nStateChange ) override;
     virtual void    Resize() override;
 
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index c396fe766c29..706cd762db94 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -83,7 +83,7 @@ public:
     virtual         ~Dialog() override;
     virtual void    dispose() override;
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    StateChanged( StateChangedType nStateChange ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index e80851102371..8bb879163753 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -287,7 +287,7 @@ public:
     virtual void    Resizing( Size& rSize );
     virtual bool    Close();
     virtual void    Tracking( const TrackingEvent& rTEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    StateChanged( StateChangedType nType ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index d5420e039508..b149d1a39f95 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -431,7 +431,7 @@ public:
     explicit                PatternField( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            Modify() override;
     virtual void            dispose() override;
 };
@@ -443,7 +443,7 @@ public:
     explicit                NumericField( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual Size            CalcMinimumSize() const override;
@@ -465,7 +465,7 @@ public:
     explicit                MetricField( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual Size            CalcMinimumSize() const override;
@@ -528,7 +528,7 @@ public:
     CurrencyField( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual void            Modify() override;
@@ -554,7 +554,7 @@ public:
     explicit                DateField( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual void            Modify() override;
@@ -585,7 +585,7 @@ public:
     explicit                TimeField( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual void            Modify() override;
@@ -611,7 +611,7 @@ public:
                             PatternBox( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
 
     virtual void            Modify() override;
 
@@ -628,7 +628,7 @@ public:
     virtual Size            CalcMinimumSize() const override;
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual void            Modify() override;
@@ -646,7 +646,7 @@ public:
     explicit                MetricBox( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual Size            CalcMinimumSize() const override;
@@ -676,7 +676,7 @@ public:
     explicit                CurrencyBox( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual void            Modify() override;
@@ -694,7 +694,7 @@ public:
     explicit                DateBox( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual void            Modify() override;
@@ -710,7 +710,7 @@ public:
     explicit                TimeBox( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            Notify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
     virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual void            Modify() override;
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index a5d780c23c6f..a63d0e1422c1 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -138,7 +138,7 @@ public:
     virtual         ~FloatingWindow() override;
     virtual void    dispose() override;
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    StateChanged( StateChangedType nType ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 542788ef038a..59a0817d70c6 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -503,7 +503,7 @@ protected:
     virtual void setAllocation(const Size &rAllocation) override;
     DECL_LINK(ScrollBarHdl, ScrollBar*, void);
     void InitScrollBars(const Size &rRequest);
-    virtual bool Notify(NotifyEvent& rNEvt) override;
+    virtual bool EventNotify(NotifyEvent& rNEvt) override;
 private:
     bool m_bUserManagedScrolling;
     VclPtr<ScrollBar> m_pVScroll;
diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index 3bc36f310c74..9bcbe3085e40 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -84,7 +84,7 @@ public:
                     LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     void            Modify() override;
     void            Up() override;
@@ -107,7 +107,7 @@ public:
                     LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     void            Modify() override;
     void            ReformatAll() override;
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 7d05f38dd039..7549aa5fb46f 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -71,7 +71,7 @@ protected:
     using Window::ImplInit;
     SAL_DLLPRIVATE void   ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     void            EndDropDown();
 
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index e26db18d82b5..99d7502d0745 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -196,7 +196,7 @@ public:
     virtual         ~SystemWindow() override;
     virtual void    dispose() override;
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
 
     virtual bool    Close();
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index fbd7d28a3d1e..e9a9dc86f72d 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -103,7 +103,7 @@ public:
     virtual void        LoseFocus() override;
     virtual void        RequestHelp( const HelpEvent& rHEvt ) override;
     virtual void        Command( const CommandEvent& rCEvt ) override;
-    virtual bool        Notify( NotifyEvent& rNEvt ) override;
+    virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
     virtual void        StateChanged( StateChangedType nType ) override;
     virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
     virtual bool        PreNotify( NotifyEvent& rNEvt ) override;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index be8110606091..f2881b8fbc01 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -281,7 +281,7 @@ public:
     virtual void        Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
     virtual void        Resize() override;
     virtual void        RequestHelp( const HelpEvent& rHEvt ) override;
-    virtual bool        Notify( NotifyEvent& rNEvt ) override;
+    virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
     virtual void        Command( const CommandEvent& rCEvt ) override;
     virtual void        StateChanged( StateChangedType nType ) override;
     virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 8461413eec89..b772aea6829d 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -49,7 +49,7 @@ protected:
     void            StateChanged( StateChangedType nType ) override;
     void            DataChanged( const DataChangedEvent& rDCEvt ) override;
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     using Control::ImplInitSettings;
     void            ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
     static WinBits  ImplInitStyle( WinBits nStyle );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 476da58f5000..7fbb39df9d0e 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -805,7 +805,7 @@ public:
     virtual void                        StateChanged( StateChangedType nStateChange );
     virtual void                        DataChanged( const DataChangedEvent& rDCEvt );
     virtual bool                        PreNotify( NotifyEvent& rNEvt );
-    virtual bool                        Notify( NotifyEvent& rNEvt );
+    virtual bool                        EventNotify( NotifyEvent& rNEvt );
 
     // These methods call the relevant virtual method when not in/post dispose
     void                                CompatGetFocus();