removed GetLabel() which didn't do anything but forwarding to wxControl version

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 2a7d0437bf6b44c4c240e42a8f7ca642c2b22e0f..a0acbe43a462a7debc93ac90787b7be6736ae525 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checkbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -42,7 +37,8 @@ extern wxWindowGTK   *g_delayedFocus;
 // "clicked"
 //-----------------------------------------------------------------------------
 
 // "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 (g_isIdle) wxapp_install_idle_handler();
 


@@ -52,11 +48,64 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
     
     if (cb->m_blockEvent) return;
 
     
     if (cb->m_blockEvent) return;
 

+#ifdef __WXGTK20__
+    // 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->m_blockEvent = true;
+            
+            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->m_blockEvent = false;
+        }
+        else
+        {
+            // user's action unsets undetermined state:
+            gtk_toggle_button_set_inconsistent(toggle, false);
+        }
+    }
+#endif
+

     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());

-    event.SetInt( cb->GetValue() );
+#ifdef __WXGTK20__
+    event.SetInt(cb->Get3StateValue());
+#else
+    event.SetInt(cb->GetValue());
+#endif

     event.SetEventObject(cb);
     cb->GetEventHandler()->ProcessEvent(event);
 }
     event.SetEventObject(cb);
     cb->GetEventHandler()->ProcessEvent(event);
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxCheckBox
 
 //-----------------------------------------------------------------------------
 // wxCheckBox


@@ -88,6 +137,11 @@ bool wxCheckBox::Create(wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

+    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 )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with
     if ( style & wxALIGN_RIGHT )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with


@@ -114,25 +168,13 @@ bool wxCheckBox::Create(wxWindow *parent,
     SetLabel( label );
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
     SetLabel( label );
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),

-                        "clicked",
-                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
+                        "toggled",
+                        GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback),

                         (gpointer *)this );
 
     m_parent->DoAddChild( this );
 
                         (gpointer *)this );
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-    InheritAttributes();
-
-    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 );
-
-    Show( TRUE );
+    PostCreation(size);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -155,9 +197,34 @@ bool wxCheckBox::GetValue() const
 {
     wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
 
 {
     wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
 

+#ifdef __WXGTK20__
+    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));
+#else

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

+#endif
+}
+
+#ifdef __WXGTK20__
+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;
+    }
+}
+#endif
+

 void wxCheckBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
 void wxCheckBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );


@@ -182,11 +249,10 @@ bool wxCheckBox::Enable( bool enable )
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxCheckBox::ApplyWidgetStyle()
+void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle );
-    gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
+    gtk_widget_modify_style(m_widgetCheckbox, style);
+    gtk_widget_modify_style(m_widgetLabel, style);

 }
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
 }
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )


@@ -228,4 +294,11 @@ wxSize wxCheckBox::DoGetBestSize() const
     return wxControl::DoGetBestSize();
 }
 
     return wxControl::DoGetBestSize();
 }
 

+// static
+wxVisualAttributes
+wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_check_button_new);
+}
+

 #endif
 #endif