setting correct 'default' for m_filterIndex, closes #11541

[wxWidgets.git] / src / gtk / radiobox.cpp

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 18f02bf683bcc063733516fac2a17dfaf7574316..08368f2459367ed419a7a2e6d40b1fd9243c4444 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -428,8 +428,6 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label)
 
 bool wxRadioBox::Enable( bool enable )
 {
 
 bool wxRadioBox::Enable( bool enable )
 {

-    bool isEnabled = IsEnabled();
-

     if ( !wxControl::Enable( enable ) )
         return false;
 
     if ( !wxControl::Enable( enable ) )
         return false;
 


@@ -444,10 +442,8 @@ bool wxRadioBox::Enable( bool enable )
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    if (!isEnabled && enable)
-    {
+    if (enable)

         GTKFixSensitivity();
         GTKFixSensitivity();

-    }

 
     return true;
 }
 
     return true;
 }


@@ -608,7 +604,9 @@ GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const
     {
         GtkWidget *button = GTK_WIDGET( node->GetData()->button );
 
     {
         GtkWidget *button = GTK_WIDGET( node->GetData()->button );
 

-        windows.push_back(button->window);
+        // don't put NULL pointers in the 'windows' array!
+        if (button->window)
+            windows.push_back(button->window);

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }