X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de97a3b945c99fb942209df48be26f43c1b436d..8b53e5a2261d192bce49d40f0019f52f73b1557a:/src/gtk/checkbox.cpp?ds=sidebyside

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index f42ef1867d..6e94fdfceb 100644
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,12 +21,19 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// wxCheckBox
+// "clicked"
 //-----------------------------------------------------------------------------
 
 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());
@@ -36,6 +42,8 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
   cb->GetEventHandler()->ProcessEvent(event);
 }
 
+//-----------------------------------------------------------------------------
+// wxCheckBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
@@ -54,10 +62,10 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
   SetValidator( validator );
 
-  SetLabel( label );
-
-  m_widget = gtk_check_button_new_with_label( 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;
@@ -66,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;
@@ -75,15 +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(void) const
+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 );
+  
+  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 );
+  
+  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+}
+
+void wxCheckBox::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+}
+
+