thread fixes (compiles, but doesn't work yet)

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index e5b2beb157877673c552cf3bfced13f2dbc9c33d..85425761d04dd7aa896f47ae64d22f69b533377a 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -2,9 +2,8 @@
 // Name:        checkbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,6 +14,9 @@
 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

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

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


@@ -27,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);

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


@@ -50,68 +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 );
-
-  SetValidator( validator );
+    PreCreation( parent, id, pos, size, style, name );

 
 

-  SetLabel( label );
+    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();

   
   

-  Show( TRUE );
+    gtk_widget_realize( GTK_BUTTON( m_widget )->child );
+  
+    SetLabel( label );
+
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+
+    Show( TRUE );

     
     

-  return TRUE;
+    return TRUE;

 }
 
 void wxCheckBox::SetValue( bool state )
 {
 }
 
 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" );
+    
+    if ( state == GetValue() )
+        return;
+
+    // for compatibility with wxMSW don't send notification when the check box
+    // state is changed programmatically
+    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::SetFont( const wxFont &font )
+void wxCheckBox::SetLabel( const wxString& label )

 {
 {

-  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 );
-  }
+    wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+
+    wxControl::SetLabel( label );

   
   

-  gdk_font_unref( style->font );
-  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+    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_style( label, style );
+    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 );

 }
 }

+
+