X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad60f9e7b66d326505592cc6dae034cab5826f3b..bbd55ff9564dcaf1a5d2ee93d789c4d656baabef:/src/gtk/checkbox.cpp diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 17c3ff9548..52d99fe569 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -67,7 +67,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) } else { - wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!")); + wxFAIL_MSG(wxT("3state wxCheckBox in unexpected state!")); } cb->GTKEnableEvents(); @@ -171,7 +171,7 @@ void wxCheckBox::SetValue( bool state ) if (state == GetValue()) return; - + GTKDisableEvents(); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); @@ -217,17 +217,13 @@ void wxCheckBox::SetLabel( const wxString& label ) bool wxCheckBox::Enable( bool enable ) { - bool isEnabled = IsEnabled(); - - if ( !wxControl::Enable( enable ) ) + if (!base_type::Enable(enable)) return false; gtk_widget_set_sensitive( m_widgetLabel, enable ); - if (!isEnabled && enable) - { + if (enable) GTKFixSensitivity(); - } return true; } @@ -243,11 +239,6 @@ GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const return GTK_BUTTON(m_widgetCheckbox)->event_window; } -wxSize wxCheckBox::DoGetBestSize() const -{ - return wxControl::DoGetBestSize(); -} - // static wxVisualAttributes wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))