Useful little fix that automatically hides the busy cursor in modal dialogs.

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 8c4fbbfaf956be6c7fa9794dc1c1bff6045d3274..af1d2592c3af9ad5472acf80fbb002d5c74e898d 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -14,9 +14,18 @@
 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

+#if wxUSE_CHECKBOX
+

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

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

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


@@ -29,13 +38,9 @@ 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_isIdle) wxapp_install_idle_handler();

 
 

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

 
     if (g_blockEventsOnDrag) return;
 
 
     if (g_blockEventsOnDrag) return;
 


@@ -51,42 +56,74 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 

-wxCheckBox::wxCheckBox(void)
+wxCheckBox::wxCheckBox()

 {
 }
 
 {
 }
 

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

 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 

-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( _T("wxCheckBox creation failed") );
+       return FALSE;
+    }

 
 

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

 
 

-    m_widget = gtk_check_button_new_with_label( m_label );
+    if ( style & wxALIGN_RIGHT )
+    {
+        // VZ: as I don't know a way to create a right aligned checkbox with
+        //     GTK we will create a checkbox without label and a label at the
+        //     left of it
+        m_widgetCheckbox = gtk_check_button_new();

 
 

-    m_blockFirstEvent = FALSE;
+        m_widgetLabel = gtk_label_new(m_label.mbc_str());
+        gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);

 
 

-    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_widget = gtk_hbox_new(FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(m_widget), m_widgetLabel, FALSE, FALSE, 3);
+        gtk_box_pack_start(GTK_BOX(m_widget), m_widgetCheckbox, FALSE, FALSE, 3);

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
-      GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );
+        gtk_widget_show( m_widgetLabel );
+        gtk_widget_show( m_widgetCheckbox );
+    }
+    else
+    {
+        m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
+        m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
+        m_widget = m_widgetCheckbox;
+    }

 
 

-    m_parent->AddChild( this );
+    wxSize newSize(size);
+    if (newSize.x == -1)
+    {
+        newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
+                                             m_label.mbc_str() );
+    }
+    if (newSize.y == -1)
+        newSize.y = 26;

 
 

-    (m_parent->m_insertCallback)( m_parent, this );
+    SetSize( newSize.x, newSize.y );

 
 

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

 
 

-    gtk_widget_realize( GTK_BUTTON( m_widget )->child );
+    m_parent->DoAddChild( this );

 
 

-    SetLabel( label );
+    PostCreation();

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


@@ -99,48 +136,54 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
 void wxCheckBox::SetValue( bool state )
 {
 
 void wxCheckBox::SetValue( bool state )
 {

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

 
 

-    if ( state == GetValue() )
+    if (state == GetValue())

         return;
 
         return;
 

-    // for compatibility with wxMSW don't send notification when the check box
-    // state is changed programmatically
-    m_blockFirstEvent = TRUE;
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widgetCheckbox),
+                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
+                        (gpointer *)this );

 
 

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

 }
 
 bool wxCheckBox::GetValue() const
 {
 }
 
 bool wxCheckBox::GetValue() const
 {

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

 
 

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

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

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

 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

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

 }
 
 }
 

-void wxCheckBox::Enable( bool enable )
+bool wxCheckBox::Enable( bool enable )

 {
 {

-    wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;

 
 

-    wxControl::Enable( enable );
+    gtk_widget_set_sensitive( m_widgetLabel, enable );

 
 

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

 }
 
 void wxCheckBox::ApplyWidgetStyle()
 {
     SetWidgetStyle();
 }
 
 void wxCheckBox::ApplyWidgetStyle()
 {
     SetWidgetStyle();

-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+    gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle );
+    gtk_widget_set_style( m_widgetLabel, m_widgetStyle );

 }
 
 }
 

-
+#endif