X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84eb0838423075d768a425ab8a0d49d28735c05..cbb8c1d34c68feaeb5861aa91bdbf715b2d963b0:/src/gtk1/checkbox.cpp

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index c4aac9364a..2fbd52f552 100644
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -2,9 +2,8 @@
 // Name:        checkbox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -68,8 +67,12 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
     
   PostCreation();
   
+  gtk_widget_realize( GTK_BUTTON( m_widget )->child );
+  
   SetLabel( label );
 
+  SetBackgroundColour( parent->GetBackgroundColour() );
+
   Show( TRUE );
     
   return TRUE;
@@ -77,6 +80,8 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
 void wxCheckBox::SetValue( bool state )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+
   if (state)
     gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_ACTIVE );
   else
@@ -85,49 +90,46 @@ void wxCheckBox::SetValue( bool state )
 
 bool wxCheckBox::GetValue() const
 {
-  GtkToggleButton *tb = GTK_TOGGLE_BUTTON(m_widget);
-  return tb->active;
+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid checkbox" );
+
+  return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+
   wxControl::SetLabel( label );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkLabel *g_label = GTK_LABEL( bin->child );
-  gtk_label_set( g_label, GetLabel() );
+  
+  gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
 }
 
 void wxCheckBox::Enable( bool enable )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+
   wxControl::Enable( enable );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
-  gtk_widget_set_sensitive( label, enable );
+  
+  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
 }
 
 void wxCheckBox::SetFont( const wxFont &font )
 {
-  if (((wxFont*)&font)->Ok())
-    m_font = font;
-  else
-    m_font = *wxSWISS_FONT;
-  
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
+  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+
+  wxControl::SetFont( font );
   
-  GtkStyle *style = (GtkStyle*) NULL;
-  if (!m_hasOwnStyle)
-  {
-    m_hasOwnStyle = TRUE;
-    style = gtk_style_copy( gtk_widget_get_style( label ) );
-  }
-  else
-  {
-    style = gtk_widget_get_style( label );
-  }
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+}
+
+void wxCheckBox::SetBackgroundColour( const wxColour &colour )
+{
+  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+
+  wxControl::SetBackgroundColour( colour );
   
-  gdk_font_unref( style->font );
-  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+  if (!m_backgroundColour.Ok()) return;
   
-  gtk_widget_set_style( label, style );
+  gtk_widget_set_style( m_widget, m_widgetStyle );
 }
+