Add the new showOnIdle code to various other

widget which override OnInternalIdle().


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

include/wx/gtk/window.h

@@ -183,6 +183,9 @@ public:
     // sizing under MSW.
     void GtkShowOnIdle() { m_showOnIdle = true; }
     
+    // This is called from the various OnInternalIdle methods
+    bool GtkShowFromOnIdle();
+
     // fix up the mouse event coords, used by wxListBox only so far
     virtual void FixUpMouseEvent(GtkWidget * WXUNUSED(widget),
                                  wxCoord& WXUNUSED(x),

src/gtk/checkbox.cpp

@@ -232,6 +232,9 @@ bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
 
 void wxCheckBox::OnInternalIdle()
 {
+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+    
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

src/gtk/listbox.cpp

@@ -1100,7 +1100,9 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 
 void wxListBox::OnInternalIdle()
 {
-    //RN: Is this needed anymore?
+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

src/gtk/radiobox.cpp

@@ -659,6 +659,9 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 
 void wxRadioBox::OnInternalIdle()
 {
+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+    
     if ( m_lostFocus )
     {
         m_hasFocus = false;
@@ -678,6 +681,9 @@ void wxRadioBox::OnInternalIdle()
             SetFocus();
         }
     }
+
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
 // static

src/gtk/textctrl.cpp

@@ -1678,6 +1678,9 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 
 void wxTextCtrl::OnInternalIdle()
 {
+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+
     if (g_delayedFocus == this)
     {
         if (GTK_WIDGET_REALIZED(m_widget))

src/gtk/tglbtn.cpp

@@ -181,6 +181,9 @@ bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
 
 void wxToggleBitmapButton::OnInternalIdle()
 {
+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+    
     wxCursor cursor = m_cursor;
 
     if (g_globalCursor.Ok())

src/gtk/window.cpp

@@ -2959,8 +2959,32 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
     m_resizing = false;
 }
 
+bool wxWindowGTK::GtkShowFromOnIdle()
+{
+    if (IsShown() && m_showOnIdle && !GTK_WIDGET_VISIBLE (m_widget))
+    {
+        GtkAllocation alloc;
+        alloc.x = m_x;
+        alloc.y = m_y;
+        alloc.width = m_width;
+        alloc.height = m_height;
+        gtk_widget_size_allocate( m_widget, &alloc );
+        gtk_widget_show( m_widget );
+        wxShowEvent eventShow(GetId(), true);
+        eventShow.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(eventShow);
+        m_showOnIdle = false;
+        return true;
+    }
+    
+    return false;
+}
+
 void wxWindowGTK::OnInternalIdle()
 {
+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+
     if ( m_dirtyTabOrder )
     {
         m_dirtyTabOrder = false;
@@ -2975,21 +2999,6 @@ void wxWindowGTK::OnInternalIdle()
         m_needsStyleChange = false;
     }
     
-    if (IsShown() && m_showOnIdle && !GTK_WIDGET_VISIBLE (m_widget))
-    {
-        GtkAllocation alloc;
-        alloc.x = m_x;
-        alloc.y = m_y;
-        alloc.width = m_width;
-        alloc.height = m_height;
-        gtk_widget_size_allocate( m_widget, &alloc );
-        gtk_widget_show( m_widget );
-        wxShowEvent eventShow(GetId(), true);
-        eventShow.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(eventShow);
-        m_showOnIdle = false;
-        return;
-    }
     // Update invalidated regions.
     GtkUpdate();