- if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
- m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
-
- if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
-
- gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
- GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
-
- gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), GTK_WIDGET(m_radio), x, y );
-
- int tmp = 22+gdk_string_measure( GTK_WIDGET(m_radio)->style->font, choices[i] );
- if (tmp > maxLen) maxLen = tmp;
-
- int width = m_width-10;
- if (size.x == -1) width = tmp;
- gtk_widget_set_usize( GTK_WIDGET(m_radio), width, 20 );
-
- y += 20;
- height += 20;
-
- };
- };
-
- wxSize newSize = size;
- if (newSize.x == -1) newSize.x = maxLen+10;
- if (newSize.y == -1) newSize.y = height;
- SetSize( newSize.x, newSize.y );
-
- PostCreation();
-
- Show( TRUE );
+ if ( i != 0 )
+ radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+
+ label.Empty();
+ for ( const wxChar *pc = choices[i]; *pc; pc++ )
+ {
+ if ( *pc != wxT('&') )
+ label += *pc;
+ }
+
+ m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
+
+ m_boxes.Append( (wxObject*) m_radio );
+
+ ConnectWidget( GTK_WIDGET(m_radio) );
+
+ if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
+
+ gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
+ GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+ gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow),
+ GTK_WIDGET(m_radio),
+ m_x+10, m_y+10+(i*24), 10, 10 );
+ }
+
+ wxSize ls = LayoutItems();
+
+ wxSize newSize = size;
+ if (newSize.x == -1) newSize.x = ls.x;
+ if (newSize.y == -1) newSize.y = ls.y;
+ SetSize( newSize.x, newSize.y );
+
+ m_parent->DoAddChild( this );
+
+ PostCreation();
+
+ SetLabel( title );
+
+ SetBackgroundColour( parent->GetBackgroundColour() );
+ SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
+
+ Show( TRUE );
+
+ return TRUE;
+}
+
+wxRadioBox::~wxRadioBox()
+{
+ wxNode *node = m_boxes.First();
+ while (node)
+ {
+ GtkWidget *button = GTK_WIDGET( node->Data() );
+ gtk_widget_destroy( button );
+ node = node->Next();
+ }
+}
+
+void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+{
+ wxWindow::DoSetSize( x, y, width, height, sizeFlags );