X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad60f9e7b66d326505592cc6dae034cab5826f3b..fd423a0f8f20cb494a8d19b8a222d70f5c261b93:/src/gtk/tglbtn.cpp?ds=sidebyside diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp index 97306a9a04..e0bfe0e372 100644 --- a/src/gtk/tglbtn.cpp +++ b/src/gtk/tglbtn.cpp @@ -7,7 +7,7 @@ // Created: 08.02.01 // RCS-ID: $Id$ // Copyright: (c) 2000 Johnny C. Norris II -// License: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -39,7 +39,7 @@ static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxTog } } -wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); // ------------------------------------------------------------------------ // wxBitmapToggleButton @@ -280,22 +280,18 @@ void wxToggleButton::SetLabel(const wxString& label) gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); - ApplyWidgetStyle( false ); + GTKApplyWidgetStyle( false ); } bool wxToggleButton::Enable(bool enable /*=true*/) { - bool isEnabled = IsEnabled(); - - if (!wxControl::Enable(enable)) + if (!base_type::Enable(enable)) return false; gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); - if (!isEnabled && enable) - { + if (enable) GTKFixSensitivity(); - } return true; }