- 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 );
-
- return TRUE;
-};
+ if ( i != 0 )
+ radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(rbtn) );
+
+ label.Empty();
+ for ( wxString::const_iterator pc = choices[i].begin();
+ pc != choices[i].end(); ++pc )
+ {
+ if ( *pc != wxT('&') )
+ label += *pc;
+ }
+
+ rbtn = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
+ gtk_widget_show( GTK_WIDGET(rbtn) );
+
+ g_signal_connect (rbtn, "key_press_event",
+ G_CALLBACK (gtk_radiobox_keypress_callback), this);
+
+ m_buttonsInfo.Append( new wxGTKRadioButtonInfo( rbtn, wxRect() ) );
+
+ if (HasFlag(wxRA_SPECIFY_COLS))
+ {
+ int left = i%num_of_cols;
+ int right = (i%num_of_cols) + 1;
+ int top = i/num_of_cols;
+ int bottom = (i/num_of_cols)+1;
+ gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(rbtn), left, right, top, bottom,
+ GTK_FILL, GTK_FILL, 1, 1 );
+ }
+ else
+ {
+ int left = i/num_of_rows;
+ int right = (i/num_of_rows) + 1;
+ int top = i%num_of_rows;
+ int bottom = (i%num_of_rows)+1;
+ gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(rbtn), left, right, top, bottom,
+ GTK_FILL, GTK_FILL, 1, 1 );
+ }
+
+ ConnectWidget( GTK_WIDGET(rbtn) );
+
+ if (!i)
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(rbtn), TRUE );
+
+ g_signal_connect (rbtn, "clicked",
+ G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+ g_signal_connect (rbtn, "focus_in_event",
+ G_CALLBACK (gtk_radiobutton_focus_in), this);
+ g_signal_connect (rbtn, "focus_out_event",
+ G_CALLBACK (gtk_radiobutton_focus_out), this);
+ g_signal_connect (rbtn, "size_allocate",
+ G_CALLBACK (gtk_radiobutton_size_allocate), this);
+ }
+
+ m_parent->DoAddChild( this );
+
+ PostCreation(size);
+
+ return true;
+}
+
+wxRadioBox::~wxRadioBox()
+{
+ wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
+ while (node)
+ {
+ GtkWidget *button = GTK_WIDGET( node->GetData()->button );
+ GTKDisconnect(button);
+ gtk_widget_destroy( button );
+ node = node->GetNext();
+ }
+ WX_CLEAR_LIST( wxRadioBoxButtonsInfoList, m_buttonsInfo );
+}