Tweaks needed to be able to build wxPython with wxGTK.

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 3883d1d7e27e6433eaf04323070b3d1e74158d4c..6e94fdfcebd52e6a18b54560fa4c2f7add0f2352 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -28,6 +27,13 @@ extern bool   g_blockEventsOnDrag;
 static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
 {
   if (!cb->HasVMT()) return;
+  
+  if (cb->m_blockFirstEvent)
+  {
+    cb->m_blockFirstEvent = FALSE;
+    return;
+  } 
+  
   if (g_blockEventsOnDrag) return;
   
   wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
@@ -56,10 +62,10 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
   SetValidator( validator );
 
-  wxControl::SetLabel( label );
-
   m_widget = gtk_check_button_new_with_label( m_label );
  
+  m_blockFirstEvent = FALSE;
+  
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = 25+gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;
@@ -68,8 +74,19 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
   gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
     GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );
     
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
   
+  gtk_widget_realize( GTK_BUTTON( m_widget )->child );
+  
+  SetLabel( label );
+
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+
   Show( TRUE );
     
   return TRUE;
@@ -77,57 +94,43 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
 void wxCheckBox::SetValue( bool state )
 {
-  if (state)
-    gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_ACTIVE );
-  else
-    gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_NORMAL );
+  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    
+  m_blockFirstEvent = TRUE;
+
+  gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), 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 )
+void wxCheckBox::ApplyWidgetStyle()
 {
-  if (((wxFont*)&font)->Ok())
-    m_font = font;
-  else
-    m_font = *wxSWISS_FONT;
-  
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
-  
-  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 );
-  }
-  
-  gdk_font_unref( style->font );
-  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
-  
-  gtk_widget_set_style( label, style );
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
+
+