Update OpenVMS compile support

[wxWidgets.git] / src / gtk / tglbtn.cpp

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 97306a9a0412eb37a0a330bddb8c164d261f4078..e0bfe0e372fc8dd0c2d1dca3ebc6c72aabe8e4c5 100644 (file)
--- 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
 // 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".
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 // ------------------------------------------------------------------------
 // wxBitmapToggleButton


@@ -280,22 +280,18 @@ void wxToggleButton::SetLabel(const wxString& label)
 
     gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
 
 
     gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
 

-    ApplyWidgetStyle( false );
+    GTKApplyWidgetStyle( false );

 }
 
 bool wxToggleButton::Enable(bool enable /*=true*/)
 {
 }
 
 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);
 
         return false;
 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 

-    if (!isEnabled && enable)
-    {
+    if (enable)

         GTKFixSensitivity();
         GTKFixSensitivity();

-    }

 
     return true;
 }
 
     return true;
 }