X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdf90a1a1c4b7ce58980b47c7af926dc905652e8..65303ed7eb4528c2812c5d3d20b451c9a8cac671:/src/gtk/radiobut.cpp diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index 49590debfb..9cb0c7fe16 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -47,8 +47,6 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r // wxRadioButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl) - bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label, @@ -101,6 +99,9 @@ void wxRadioButton::SetLabel( const wxString& label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") ); + // save the original label + wxControlBase::SetLabel(label); + GTKSetLabelForLabel(GTK_LABEL(GTK_BIN(m_widget)->child), label); } @@ -123,8 +124,6 @@ void wxRadioButton::SetValue( bool val ) // should give an assert // RL - No it shouldn't. A wxGenericValidator might try to set it // as FALSE. Failing silently is probably TRTTD here. - // RR - MSW actually unchecks the radio button so do this here, too - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widget), FALSE ); } g_signal_handlers_unblock_by_func(