added support for <bg> tag for toolbars in XRC

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index f3649c5007390e27bd87034fc0e70ca7e0df0b64..0e06bba68b73423db4de3e0df1244659f6374ad5 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -222,7 +222,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     for (int i = 0; i < n; i++)
     {
         if ( i != 0 )
-            radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+            radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(m_radio) );
 
         label.Empty();
         for ( const wxChar *pc = choices[i]; *pc; pc++ )
@@ -260,7 +260,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
         ConnectWidget( GTK_WIDGET(m_radio) );
 
-        if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
+        if (!i)
+            gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_radio), TRUE );
 
         g_signal_connect (m_radio, "clicked",
                           G_CALLBACK (gtk_radiobutton_clicked_callback), this);
@@ -405,7 +406,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
 
     GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child);
 
-    gtk_label_set( g_label, wxGTK_CONV( label ) );
+    gtk_label_set_text( g_label, wxGTK_CONV( label ) );
 }
 
 bool wxRadioBox::Enable( bool enable )