Fix VC++ compile error

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 15dd404b7dc91f85217d634627f758bd843774e6..08368f2459367ed419a7a2e6d40b1fd9243c4444 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -224,6 +224,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     }
 
     m_widget = GTKCreateFrame(title);
     }
 
     m_widget = GTKCreateFrame(title);

+    g_object_ref(m_widget);

     wxControl::SetLabel(title);
     if ( HasFlag(wxNO_BORDER) )
     {
     wxControl::SetLabel(title);
     if ( HasFlag(wxNO_BORDER) )
     {


@@ -240,7 +241,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     unsigned int num_of_cols = GetColumnCount();
     unsigned int num_of_rows = GetRowCount();
 
     unsigned int num_of_cols = GetColumnCount();
     unsigned int num_of_rows = GetRowCount();
 

-    GtkRadioButton *rbtn = (GtkRadioButton*) NULL;
+    GtkRadioButton *rbtn = NULL;

 
     GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
     gtk_table_set_col_spacings( GTK_TABLE(table), 1 );
 
     GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
     gtk_table_set_col_spacings( GTK_TABLE(table), 1 );


@@ -249,7 +250,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     gtk_container_add( GTK_CONTAINER(m_widget), table );
 
     wxString label;
     gtk_container_add( GTK_CONTAINER(m_widget), table );
 
     wxString label;

-    GSList *radio_button_group = (GSList *) NULL;
+    GSList *radio_button_group = NULL;

     for (unsigned int i = 0; i < (unsigned int)n; i++)
     {
         if ( i != 0 )
     for (unsigned int i = 0; i < (unsigned int)n; i++)
     {
         if ( i != 0 )


@@ -441,6 +442,9 @@ bool wxRadioBox::Enable( bool enable )
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

+    if (enable)
+        GTKFixSensitivity();
+

     return true;
 }
 
     return true;
 }
 


@@ -563,7 +567,7 @@ void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip)
+void wxRadioBox::GTKApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip)

 {
     // set this tooltip for all radiobuttons which don't have their own tips
     unsigned n = 0;
 {
     // set this tooltip for all radiobuttons which don't have their own tips
     unsigned n = 0;


@@ -573,7 +577,7 @@ void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip)
     {
         if ( !GetItemToolTip(n) )
         {
     {
         if ( !GetItemToolTip(n) )
         {

-            wxToolTip::Apply(GTK_WIDGET(node->GetData()->button), tip);
+            wxToolTip::GTKApply(GTK_WIDGET(node->GetData()->button), tip);

         }
     }
 }
         }
     }
 }


@@ -586,7 +590,7 @@ void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip)
     if ( tooltip )
         buf = wxGTK_CONV(tooltip->GetTip());
 
     if ( tooltip )
         buf = wxGTK_CONV(tooltip->GetTip());
 

-    wxToolTip::Apply(GTK_WIDGET(m_buttonsInfo[n]->button), buf);
+    wxToolTip::GTKApply(GTK_WIDGET(m_buttonsInfo[n]->button), buf);

 }
 
 #endif // wxUSE_TOOLTIPS
 }
 
 #endif // wxUSE_TOOLTIPS


@@ -600,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();
     }