- 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;
-
+ 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, wxGTK_CONV( label ) ) );
+
+ gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
+ GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
+
+ 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_signal_connect( GTK_OBJECT(m_radio), "focus_in_event",
+ GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this );
+
+ gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event",
+ GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this );
+
+ gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow),
+ GTK_WIDGET(m_radio),
+ m_x+10, m_y+10+(i*24), 10, 10 );
+ }
+
+ m_parent->DoAddChild( this );
+
+ bool wasShown = IsShown();
+ if ( wasShown )
+ Hide(); // prevent PostCreation() from showing us
+ PostCreation();
+ InheritAttributes();
+
+ ApplyWidgetStyle();
+
+ SetLabel( title );
+
+ SetFont( parent->GetFont() );
+
+ SetBestSize( size );
+
+ if ( wasShown )
+ Show();
+
+ return TRUE;
+}
+
+wxRadioBox::~wxRadioBox()
+{
+ wxList::compatibility_iterator node = m_boxes.GetFirst();
+ while (node)
+ {
+ GtkWidget *button = GTK_WIDGET( node->GetData() );
+ gtk_widget_destroy( button );
+ node = node->GetNext();
+ }
+}
+
+void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+{
+ wxWindow::DoSetSize( x, y, width, height, sizeFlags );
+
+ LayoutItems(false);
+}
+
+wxSize wxRadioBox::DoGetBestSize() const
+{
+ wxSize size = LayoutItems(true);
+
+ GtkRequisition req;
+ req.width = 2;
+ req.height = 2;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
+ if (req.width > size.x)
+ size.x = req.width;
+
+ return size;
+}
+
+wxSize wxRadioBox::LayoutItems(bool justCalc) const
+{
+ wxSize res( 0, 0 );
+
+ // avoid dividing by 0 below
+ wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );
+
+ int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
+
+ int x = 7;
+ int y = 15;
+
+ int num_of_cols = 0;
+ int num_of_rows = 0;
+ if (HasFlag(wxRA_SPECIFY_COLS))
+ {
+ num_of_cols = m_majorDim;
+ num_of_rows = num_per_major;
+ }
+ else
+ {
+ num_of_cols = num_per_major;
+ num_of_rows = m_majorDim;