move default OnInternalIdle processing to wxWindowBase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h
index b12d07ab87643459da6fc678f831ca31f4925ee9..f6018c7c3f65c2cd5f2f1ded7391ed83891def3f 100644 (file)
--- a/include/wx/dfb/window.h
+++ b/include/wx/dfb/window.h
@@ -100,8 +100,6 @@ public:
     // returns toplevel window the window belongs to
     wxNonOwnedWindow *GetTLW() const { return m_tlw; }
 
-    void OnInternalIdle();
-
     virtual bool IsDoubleBuffered() const { return true; }
 
 protected:

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 73f03e2945d5238d1eed72955c041f282647e719..164337796cd909cb3ed49e0b6e8aedf8631715bb 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -46,8 +46,6 @@ public:
 
     virtual wxVisualAttributes GetDefaultAttributes() const;
 
-    virtual void OnInternalIdle();
-
 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);

diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h
index c752a8dd45f1855eb31ee41990b3f3cdb25a40f1..6b15764910e45f088035f642cd073c1e4f069701 100644 (file)
--- a/include/wx/gtk/toolbar.h
+++ b/include/wx/gtk/toolbar.h
@@ -59,8 +59,6 @@ public:
     // implementation from now on
     // --------------------------
 
-    void OnInternalIdle();
-
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 92f50b208bd697c8fd9be6f501b8998767867999..8f72a2747612871618521c6f3d6d14c310793f80 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -89,8 +89,6 @@ public:
     // implementation from now on
     // --------------------------
 
-    void OnInternalIdle();
-
 protected:
     virtual void DoFreeze();
     virtual void DoThaw();

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index 0069899bff66001d0fa9b9b43317758a1099fe6b..82c17932209e3f68f7482907fb881e407eaddff6 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -138,9 +138,6 @@ public:
     void ClearUpdateRegion() { m_updateRegion.Clear(); }
     void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; }
 
-    // Process idle (send update events)
-    void OnInternalIdle();
-
     // post-creation activities
     void PostCreation();
 

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 875a5ef093679dca137bee4c77777f189f768a9b..c548f2171ebb30041e470bad4840a30ea259ebca 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -156,8 +156,6 @@ public:
     static long         MacRemoveBordersFromStyle( long style ) ;
 
 public:
-    void OnInternalIdle();
-
     // For implementation purposes:
     // sometimes decorations make the client area smaller
     virtual wxPoint GetClientAreaOrigin() const;

diff --git a/include/wx/window.h b/include/wx/window.h
index 2260f8fe3de1fafcd85dde19aff943123c540427..cb68751aad97f6724f03fde5b4a214450f40f104 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1370,7 +1370,7 @@ public:
 
         // virtual function for implementing internal idle
         // behaviour
-        virtual void OnInternalIdle() {}
+        virtual void OnInternalIdle();
 
         // call internal idle recursively
 //        void ProcessInternalIdle() ;

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index e458f80cda9458060481f821936f461071faa505..82e0f7a3ee686a8ab7489cb4395e24233c4d1fd8 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -2600,6 +2600,16 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
         Show(event.GetShown());
 }
 
+// ----------------------------------------------------------------------------
+// Idle processing
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::OnInternalIdle()
+{
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
 // ----------------------------------------------------------------------------
 // dialog units translations
 // ----------------------------------------------------------------------------

diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp
index bfe64b16f073298bb8a7b1f3d798b05ff89cf0d8..51707653a868e4ccb6cc636ff70365bd9d82ecfb 100644 (file)
--- a/src/dfb/window.cpp
+++ b/src/dfb/window.cpp
@@ -1054,17 +1054,6 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_)
     }
 }
 
-// ---------------------------------------------------------------------------
-// idle events processing
-// ---------------------------------------------------------------------------
-
-void wxWindowDFB::OnInternalIdle()
-{
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShown())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
-
 // Find the wxWindow at the current mouse position, returning the mouse
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 0191a2f91963ab654f5c73eab6b611b06677ccbb..7012a7572c67089da76672e00a96e2d63a83b4cb 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -314,17 +314,4 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
     return attr;
 }
 
-// ----------------------------------------------------------------------------
-// idle handling
-// ----------------------------------------------------------------------------
-
-void wxControl::OnInternalIdle()
-{
-    if ( GTKShowFromOnIdle() )
-        return;
-
-    if ( wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen() )
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
 #endif // wxUSE_CONTROLS

diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp
index b25f775019f4743eeb74771cd5bc9ee1f682d005..969c7f9f360f55b806ea72b459a3e10d662d4bff 100644 (file)
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -747,20 +747,6 @@ void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
     }
 }
 
-// ----------------------------------------------------------------------------
-// wxToolBar idle handling
-// ----------------------------------------------------------------------------
-
-void wxToolBar::OnInternalIdle()
-{
-    // Check if we have to show window now
-    if (GTKShowFromOnIdle()) return;
-
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
-
 // ----------------------------------------------------------------------------
 
 // static

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 18d5775a2fc73a5d5231e89189ea0b68d39485a1..4e3e5603235e8ba503b61951b562e5fb97b9daa2 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -1144,7 +1144,7 @@ wxSize& wxTopLevelWindowGTK::GetCachedDecorSize()
 
 void wxTopLevelWindowGTK::OnInternalIdle()
 {
-    wxWindow::OnInternalIdle();
+    wxTopLevelWindowBase::OnInternalIdle();
 
     // Synthetize activate events.
     if ( g_sendActivateEvent != -1 )

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 26e7dc2b446f9b1a7d3ff0bde73b3230ed58d3a3..85c1dfc1d147c33d4275dce3e2b8b8f014b7592f 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2615,8 +2615,7 @@ void wxWindowGTK::OnInternalIdle()
         m_needsStyleChange = false;
     }
 
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+    wxWindowBase::OnInternalIdle();
 }
 
 void wxWindowGTK::DoGetSize( int *width, int *height ) const

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index dcefcff70ce710a6a875a3094043251c9ac568c3..c339054997730158a6f9bbb98ccbcd3a253211ed 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2960,8 +2960,7 @@ void wxWindowGTK::OnInternalIdle()
         }
     }
 
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+    wxWindowBase::OnInternalIdle();
 }
 
 void wxWindowGTK::DoGetSize( int *width, int *height ) const

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index d46081e8b1ae021a932cde887c4299998e53b600..aad3ea0e6b415f035fcc7ed73a093b8eb854e043 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -1206,14 +1206,3 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     window_t *wnd = MGL_wmGetWindowAtPosition(g_winMng, pt.x, pt.y);
     return (wxWindow*)wnd->userData;
 }
-
-
-// ---------------------------------------------------------------------------
-// idle events processing
-// ---------------------------------------------------------------------------
-
-void wxWindowMGL::OnInternalIdle()
-{
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShown())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 9fa2c9e3dc0898d3b57011a70daa6544a176c40d..6078beb09c89d91ae39443d11880e263370ded12 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -1652,14 +1652,6 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
     }
 }
 
-void wxWindow::OnInternalIdle()
-{
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
 // ----------------------------------------------------------------------------
 // accelerators
 // ----------------------------------------------------------------------------

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 6e3bd673e477894e2f866fb5cbaf2227bc4df197..0c442570e223e9e1b0e18d4cfbc849f351adcc62 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1507,8 +1507,7 @@ void wxWindowMSW::OnInternalIdle()
     }
 #endif // !HAVE_TRACKMOUSEEVENT
 
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+    wxWindowBase::OnInternalIdle();
 }
 
 // Set this window to be the child of 'parent'.

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index ddcc14e1d099eab510f2bcd2d5e8294824d730e6..2974b884e33aa61b55f5c132ea31759a82fc693f 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1087,8 +1087,6 @@ void wxWindowOS2::OnIdle(
             (void)HandleWindowEvent(rEvent);
         }
     }
-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 } // end of wxWindowOS2::OnIdle
 
 //

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 6fe191e35995435ef8925544a93511dd422b0d4b..ce444b9913fe61f059964f7a0099167dd1d1f853 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1683,14 +1683,6 @@ wxWindow *wxWindowBase::DoFindFocus()
     return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());
 }
 
-void wxWindowMac::OnInternalIdle()
-{
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
 // Raise the window to the top of the Z order
 void wxWindowMac::Raise()
 {

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 7c2e5ae15b16978a61923ae1049b863f8cca598d..e9692b860084042ad59311d8c4f0e58b2812e38c 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -1318,10 +1318,7 @@ void wxWindowX11::OnInternalIdle()
     // Update invalidated regions.
     Update();
 
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-    if (wxUpdateUIEvent::CanUpdate((wxWindow*) this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+    wxWindowBase::OnInternalIdle();
 
     // Set the input focus if couldn't do it before
     if (m_needsInputFocus)