]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/checkbox.cpp
fix wxGTK1 compilation after wxTextEntry DoGetValue() change
[wxWidgets.git] / src / gtk / checkbox.cpp
index 8bc24ddf9e682acf443fd65856bb6a689257791f..17c3ff9548378cbcd8bf29a216069e6ca55263cf 100644 (file)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.cpp
+// Name:        src/gtk/checkbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,48 +7,83 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation "checkbox.h"
-#endif
+#if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"
 
-#if wxUSE_CHECKBOX
-
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
-extern bool       g_blockEventsOnDrag;
-extern wxCursor   g_globalCursor;
+extern bool           g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 
-static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
+extern "C" {
+static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
 
+    // Transitions for 3state checkbox must be done manually, GTK's checkbox
+    // is 2state with additional "undetermined state" flag which isn't
+    // changed automatically:
+    if (cb->Is3State())
+    {
+        GtkToggleButton *toggle = GTK_TOGGLE_BUTTON(widget);
+
+        if (cb->Is3rdStateAllowedForUser())
+        {
+            // The 3 states cycle like this when clicked:
+            // checked -> undetermined -> unchecked -> checked -> ...
+            bool active = gtk_toggle_button_get_active(toggle);
+            bool inconsistent = gtk_toggle_button_get_inconsistent(toggle);
+
+            cb->GTKDisableEvents();
+
+            if (!active && !inconsistent)
+            {
+                // checked -> undetermined
+                gtk_toggle_button_set_active(toggle, true);
+                gtk_toggle_button_set_inconsistent(toggle, true);
+            }
+            else if (!active && inconsistent)
+            {
+                // undetermined -> unchecked
+                gtk_toggle_button_set_inconsistent(toggle, false);
+            }
+            else if (active && !inconsistent)
+            {
+                // unchecked -> checked
+                // nothing to do
+            }
+            else
+            {
+                wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!"));
+            }
+
+            cb->GTKEnableEvents();
+        }
+        else
+        {
+            // user's action unsets undetermined state:
+            gtk_toggle_button_set_inconsistent(toggle, false);
+        }
+    }
+
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
-    event.SetInt( cb->GetValue() );
+    event.SetInt(cb->Get3StateValue());
     event.SetEventObject(cb);
-    cb->GetEventHandler()->ProcessEvent(event);
+    cb->HandleWindowEvent(event);
+}
 }
 
 //-----------------------------------------------------------------------------
@@ -70,17 +105,17 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString &name )
 {
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxCheckBox creation failed") );
-           return FALSE;
+        return false;
     }
 
-    wxControl::SetLabel( label );
+    wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
+                  (style & wxCHK_3STATE) != 0,
+                  wxT("Using wxCHK_ALLOW_3RD_STATE_FOR_USER")
+                  wxT(" style flag for a 2-state checkbox is useless") );
 
     if ( style & wxALIGN_RIGHT )
     {
@@ -89,7 +124,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 
-        m_widgetLabel = gtk_label_new(m_label.mbc_str());
+        m_widgetLabel = gtk_label_new("");
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);
@@ -101,37 +136,33 @@ bool wxCheckBox::Create(wxWindow *parent,
     }
     else
     {
-        m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
-        m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
+        m_widgetCheckbox = gtk_check_button_new_with_label("");
+        m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child;
         m_widget = m_widgetCheckbox;
     }
+    g_object_ref(m_widget);
+    SetLabel( label );
 
-    gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
-                        "clicked",
-                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
-                        (gpointer *)this );
+    g_signal_connect (m_widgetCheckbox, "toggled",
+                      G_CALLBACK (gtk_checkbox_toggled_callback), this);
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
+    PostCreation(size);
 
-    SetFont( parent->GetFont() );
-
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
+    return true;
+}
 
-    Show( TRUE );
+void wxCheckBox::GTKDisableEvents()
+{
+    g_signal_handlers_block_by_func(m_widgetCheckbox,
+        (gpointer) gtk_checkbox_toggled_callback, this);
+}
 
-    return TRUE;
+void wxCheckBox::GTKEnableEvents()
+{
+    g_signal_handlers_unblock_by_func(m_widgetCheckbox,
+        (gpointer) gtk_checkbox_toggled_callback, this);
 }
 
 void wxCheckBox::SetValue( bool state )
@@ -140,73 +171,76 @@ void wxCheckBox::SetValue( bool state )
 
     if (state == GetValue())
         return;
+    GTKDisableEvents();
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widgetCheckbox),
-                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
-                        (gpointer *)this );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), 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 );
+    GTKEnableEvents();
 }
 
 bool wxCheckBox::GetValue() const
 {
-    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
+    wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") );
 
-    return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
+    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));
+}
+
+void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
+{
+    SetValue(state != wxCHK_UNCHECKED);
+    gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(m_widgetCheckbox),
+                                       state == wxCHK_UNDETERMINED);
+}
+
+wxCheckBoxState wxCheckBox::DoGet3StateValue() const
+{
+    if (gtk_toggle_button_get_inconsistent(GTK_TOGGLE_BUTTON(m_widgetCheckbox)))
+    {
+        return wxCHK_UNDETERMINED;
+    }
+    else
+    {
+        return GetValue() ? wxCHK_CHECKED : wxCHK_UNCHECKED;
+    }
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
 
-    wxControl::SetLabel( label );
+    // save the label inside m_label in case user calls GetLabel() later
+    wxControl::SetLabel(label);
 
-    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
+    GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label);
 }
 
 bool wxCheckBox::Enable( bool enable )
 {
+    bool isEnabled = IsEnabled();
+
     if ( !wxControl::Enable( enable ) )
-        return FALSE;
+        return false;
 
     gtk_widget_set_sensitive( m_widgetLabel, enable );
 
-    return TRUE;
-}
+    if (!isEnabled && enable)
+    {
+        GTKFixSensitivity();
+    }
 
-void wxCheckBox::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle );
-    gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
+    return true;
 }
 
-bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
+void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+    gtk_widget_modify_style(m_widgetCheckbox, style);
+    gtk_widget_modify_style(m_widgetLabel, style);
 }
 
-void wxCheckBox::OnInternalIdle()
+GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
-    if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window && cursor.Ok())
-    {
-        /* I now set the cursor the anew in every OnInternalIdle call
-              as setting the cursor in a parent window also effects the
-              windows above so that checking for the current cursor is
-              not possible. */
-          
-          gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() );
-    }
-
-    UpdateWindowUI();
+    return GTK_BUTTON(m_widgetCheckbox)->event_window;
 }
 
 wxSize wxCheckBox::DoGetBestSize() const
@@ -214,4 +248,11 @@ wxSize wxCheckBox::DoGetBestSize() const
     return wxControl::DoGetBestSize();
 }
 
+// static
+wxVisualAttributes
+wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_check_button_new);
+}
+
 #endif