X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/868a28262c40a7428d3991ca8a034674814bdb0a..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/checkbox.cpp

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 2604d6d360..c4aac9364a 100644
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -56,8 +56,6 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
   SetValidator( validator );
 
-  SetLabel( label );
-
   m_widget = gtk_check_button_new_with_label( m_label );
  
   wxSize newSize = size;
@@ -70,6 +68,8 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
     
   PostCreation();
   
+  SetLabel( label );
+
   Show( TRUE );
     
   return TRUE;
@@ -83,15 +83,34 @@ void wxCheckBox::SetValue( bool state )
     gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_NORMAL );
 }
 
-bool wxCheckBox::GetValue(void) const
+bool wxCheckBox::GetValue() const
 {
   GtkToggleButton *tb = GTK_TOGGLE_BUTTON(m_widget);
   return tb->active;
 }
 
+void wxCheckBox::SetLabel( const wxString& label )
+{
+  wxControl::SetLabel( label );
+  GtkButton *bin = GTK_BUTTON( m_widget );
+  GtkLabel *g_label = GTK_LABEL( bin->child );
+  gtk_label_set( g_label, GetLabel() );
+}
+
+void wxCheckBox::Enable( bool enable )
+{
+  wxControl::Enable( enable );
+  GtkButton *bin = GTK_BUTTON( m_widget );
+  GtkWidget *label = bin->child;
+  gtk_widget_set_sensitive( label, enable );
+}
+
 void wxCheckBox::SetFont( const wxFont &font )
 {
-  m_font = font;
+  if (((wxFont*)&font)->Ok())
+    m_font = font;
+  else
+    m_font = *wxSWISS_FONT;
   
   GtkButton *bin = GTK_BUTTON( m_widget );
   GtkWidget *label = bin->child;