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

14 files changed, 26 insertions, 26 deletions

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 bdf95204db44..0d1f5f5e709b 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -125,7 +125,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 0d763bda6f62..78a0c3c27b58 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 1a6910e613c7..f3946163bf88 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -285,7 +285,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 bca7e4e8fd8a..c19865b4e76e 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -430,7 +430,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;
 };
@@ -442,7 +442,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;
@@ -464,7 +464,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;
@@ -527,7 +527,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;
@@ -553,7 +553,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;
@@ -584,7 +584,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;
@@ -610,7 +610,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;
 
@@ -627,7 +627,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;
@@ -645,7 +645,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;
@@ -675,7 +675,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;
@@ -693,7 +693,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;
@@ -709,7 +709,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 680cc13131af..9279f5e3a50e 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -137,7 +137,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 2c1681e8d892..225348423224 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -194,7 +194,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 66bd8cf41f98..03319ba57f26 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 84b5a6bea56c..41663b461097 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -47,7 +47,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 4fdb80560d68..87c7f7befb51 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -802,7 +802,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();