The usual amount of trash over my telephone fixed

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 818619187d324938d04056416d418f3df9a7a7c9..85425761d04dd7aa896f47ae64d22f69b533377a 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -14,6 +14,9 @@
 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -26,13 +29,20 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
 {
 
 static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
 {

-  if (!cb->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
+    if (!cb->HasVMT()) return;
+  
+    if (cb->m_blockFirstEvent)
+    {
+        cb->m_blockFirstEvent = FALSE;
+        return;
+    } 

   
   

-  wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
-  event.SetInt( cb->GetValue() );
-  event.SetEventObject(cb);
-  cb->GetEventHandler()->ProcessEvent(event);
+    if (g_blockEventsOnDrag) return;
+  
+    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
+    event.SetInt( cb->GetValue() );
+    event.SetEventObject(cb);
+    cb->GetEventHandler()->ProcessEvent(event);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -49,93 +59,87 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
       const wxPoint &pos, const wxSize &size, 
       long style, const wxValidator& validator, const wxString &name )
 {
       const wxPoint &pos, const wxSize &size, 
       long style, const wxValidator& validator, const wxString &name )
 {

-  m_needParent = TRUE;
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;

   
   

-  PreCreation( parent, id, pos, size, style, name );
+    PreCreation( parent, id, pos, size, style, name );

 
 

-  SetValidator( validator );
+    SetValidator( validator );

 
 

-  m_widget = gtk_check_button_new_with_label( m_label );
+    m_widget = gtk_check_button_new_with_label( m_label );

  
  

-  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;
-  SetSize( newSize.x, newSize.y );
+    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;
+    SetSize( newSize.x, newSize.y );

    
    

-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+      GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );

     
     

-  PostCreation();
+    m_parent->AddChild( this );
+
+    (m_parent->m_insertCallback)( m_parent, this );
+  
+    PostCreation();

   
   

-  gtk_widget_realize( GTK_BUTTON( m_widget )->child );
+    gtk_widget_realize( GTK_BUTTON( m_widget )->child );

   
   

-  SetLabel( label );
+    SetLabel( label );

 
 

-  SetBackgroundColour( parent->GetBackgroundColour() );
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );

 
 

-  Show( TRUE );
+    Show( TRUE );

     
     

-  return TRUE;
+    return TRUE;

 }
 
 void wxCheckBox::SetValue( bool state )
 {
 }
 
 void wxCheckBox::SetValue( bool state )
 {

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    
+    if ( state == GetValue() )
+        return;
+
+    // for compatibility with wxMSW don't send notification when the check box
+    // state is changed programmatically
+    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
 {
 }
 
 bool wxCheckBox::GetValue() const
 {

-  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid checkbox" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid checkbox" );

 
 

-  return GTK_TOGGLE_BUTTON(m_widget)->active;
+    return GTK_TOGGLE_BUTTON(m_widget)->active;

 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widget != NULL, "invalid checkbox" );

 
 

-  wxControl::SetLabel( label );
+    wxControl::SetLabel( label );

   
   

-  gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );

 }
 
 void wxCheckBox::Enable( bool enable )
 {
 }
 
 void wxCheckBox::Enable( bool enable )
 {

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widget != NULL, "invalid checkbox" );

 
 

-  wxControl::Enable( enable );
+    wxControl::Enable( enable );

   
   

-  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );

 }
 
 }
 

-void wxCheckBox::SetFont( const wxFont &font )
+void wxCheckBox::ApplyWidgetStyle()

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
-
-  wxControl::SetFont( font );
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );

 }
 
 }
 

-void wxCheckBox::SetBackgroundColour( const wxColour &colour )
-{
-  return;
-
-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
-
-  wxControl::SetBackgroundColour( colour );
-  
-  if (!m_backgroundColour.Ok()) return;
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
-}