New wxDataObject, DnD and Clipboard code

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index c125d9d2dfc7534ab41ef489fd66a5bb08a07810..6e94fdfcebd52e6a18b54560fa4c2f7add0f2352 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -27,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());
@@ -57,6 +64,8 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &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;
@@ -86,11 +95,10 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 void wxCheckBox::SetValue( bool state )
 {
   wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    
+  m_blockFirstEvent = TRUE;
 
-  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 );
+  gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), state );
 }
 
 bool wxCheckBox::GetValue() const