OnIdle -> OnInternalIdle

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 6a7dc88036e14f2d8db5f22b7493c5f8b5980eea..8fd3c330073048fff7bd7b5ee7387054cf118fdc 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -164,7 +164,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
-    void OnIdle( wxIdleEvent &event );
+    void OnInternalIdle( );
     void OnSize( wxSizeEvent &event );
 
     // We have to hand down a few functions

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index ccb9227047cc9ed3ac47c1c18247c67b101ddd34..91cc13f7256ffee2978060985112ac06fb46f5c9 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -113,7 +113,7 @@ public:
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
-  void OnIdle(wxIdleEvent& event);
+  void OnInternalIdle();
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index c11307d69afd4900880baf6bf575ac4663ea9eb3..e94f7a906868566308b1e07499a8759fd7ed1921 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -190,7 +190,7 @@ public:
     void OnSize(wxSizeEvent& event);
 
     // In live mode, resize child windows in idle time
-    void OnIdle(wxIdleEvent& event);
+    void OnInternalIdle();
 
     // Draws borders
     virtual void DrawBorders(wxDC& dc);

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 72da30c0f2d858f89a9fbd3e771089809c87d091..d7856f0ea613df244556007030711ff54df4a792 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -362,7 +362,7 @@ public:
     void OnKillFocus( wxFocusEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnMouse( wxMouseEvent &event );
-    void OnIdle( wxIdleEvent &event );
+    void OnInternalIdle( );
 
     // implementation helpers
 protected:

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 8ac2730813f344f9224a7c2e203c9cd97119a0f3..da9d6431a9be3a230d352491ef684e34fb903df7 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -214,7 +214,6 @@ protected:
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseDown(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);
-    void OnIdle(wxIdleEvent& event);
 #if wxUSE_CLIPBOARD
     void OnKeyUp(wxKeyEvent& event);
     void OnDoubleClick(wxMouseEvent& event);
@@ -223,6 +222,8 @@ protected:
     void OnMouseLeave(wxMouseEvent& event);
 #endif // wxUSE_CLIPBOARD
 
+    virtual void OnInternalIdle();
+
     // Returns new filter (will be stored into m_DefaultFilter variable)
     virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
 

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 93a76fd0fd30f087a99bb83e2c7e4116fecc42b6..17ae8faab93fe86bf6fcb64872bcaa8f46223296 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -4432,7 +4432,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
   EVT_SIZE(wxGenericListCtrl::OnSize)
-  EVT_IDLE(wxGenericListCtrl::OnIdle)
 END_EVENT_TABLE()
 
 wxGenericListCtrl::wxGenericListCtrl()
@@ -5035,10 +5034,10 @@ void wxGenericListCtrl::ResizeReportView(bool showHeader)
     }
 }
 
-void wxGenericListCtrl::OnIdle( wxIdleEvent & event )
+void wxGenericListCtrl::OnInternalIdle()
 {
-    event.Skip();
-
+    wxWindow::OnInternalIdle();
+    
     // do it only if needed
     if ( !m_mainWin->m_dirty )
         return;

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 18356d6b23ad87ef5c90e13e8073cb46bf0378a9..b56c4ef1cde886d3d8030bd6a893c3d917fda3f1 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -432,8 +432,6 @@ public:
 #endif // wxUSE_FILE
     void OnClear(wxCommandEvent& event);
 
-    void OnIdle(wxIdleEvent&);
-
     // accessors
     wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
 

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index e64231b122327823be9f17ead15ba81b0e712c81..853fc8ab7d94ffc6e2d8713953351ff3e27bd1e5 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -56,7 +56,6 @@ BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_MOUSE_EVENTS(wxNotebook::OnMouseEvent)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
-//    EVT_IDLE(wxNotebook::OnIdle)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
@@ -457,8 +456,11 @@ void wxNotebook::OnSize(wxSizeEvent& event)
 // This was supposed to cure the non-display of the notebook
 // until the user resizes the window.
 // What's going on?
-void wxNotebook::OnIdle(wxIdleEvent& event)
+void wxNotebook::OnInternalIdle()
 {
+    wxWindow::OnInternalIdle();
+
+#if 0    
     static bool s_bFirstTime = TRUE;
     if ( s_bFirstTime ) {
       /*
@@ -478,7 +480,7 @@ void wxNotebook::OnIdle(wxIdleEvent& event)
       */
       s_bFirstTime = FALSE;
     }
-    event.Skip();
+#endif
 }
 
 // Implementation: calculate the layout of the view rect

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 01e143d8b8a928c1bda70b1bd3957149cbf990c6..6c5965e49aba1355fda8709a7b37f30a9096c383 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -50,7 +50,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent)
 BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)
-    EVT_IDLE(wxSplitterWindow::OnIdle)
     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__)
@@ -156,12 +155,12 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     DrawSash(dc);
 }
 
-void wxSplitterWindow::OnIdle(wxIdleEvent& event)
+void wxSplitterWindow::OnInternalIdle()
 {
+    wxWindow::OnInternalIdle();
+    
     if (m_needUpdating)
         SizeWindows();
-
-    event.Skip();
 }
 
 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 9255fb67cbfda708bfa5ddba409b02da0a6bf40b..b7140c589af5e803d5601749609ea9dc00cf9ffc 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -716,7 +716,6 @@ BEGIN_EVENT_TABLE(wxGenericTreeCtrl,wxScrolledWindow)
     EVT_CHAR           (wxGenericTreeCtrl::OnChar)
     EVT_SET_FOCUS      (wxGenericTreeCtrl::OnSetFocus)
     EVT_KILL_FOCUS     (wxGenericTreeCtrl::OnKillFocus)
-    EVT_IDLE           (wxGenericTreeCtrl::OnIdle)
 END_EVENT_TABLE()
 
 #if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
@@ -3158,8 +3157,10 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     }
 }
 
-void wxGenericTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
+void wxGenericTreeCtrl::OnInternalIdle()
 {
+    wxWindow::OnInternalIdle();
+    
     // Check if we need to select the root item
     // because nothing else has been selected.
     // Delaying it means that we can invoke event handlers

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index b2ddf594928e2fc647e89de4120d3b8bbf8c6b4b..8afb3a1fba18612860bd286e074430afabdb47e5 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -964,8 +964,10 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
 
 
 
-void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
-{    
+void wxHtmlWindow::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+    
     if (m_tmpMouseMoved && (m_Cell != NULL))
     {
 #ifdef DEBUG_HTML_SELECTION
@@ -1312,7 +1314,6 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
     EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp)
     EVT_MOTION(wxHtmlWindow::OnMouseMove)
-    EVT_IDLE(wxHtmlWindow::OnIdle)
     EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground)
     EVT_PAINT(wxHtmlWindow::OnPaint)
 #if wxUSE_CLIPBOARD