Just correct the path in the header comment.

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 83a09934100fc333abcc400c245577fa0e5bf872..3fb4de8aea8960d5f8212fd4b886ce99ca17a2f5 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -15,6 +15,7 @@
 #include "wx/checkbox.h"
 
 #include <gtk/gtk.h>
 #include "wx/checkbox.h"
 
 #include <gtk/gtk.h>

+#include "wx/gtk/private/gtk2-compat.h"

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


@@ -44,8 +45,8 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
         {
             // The 3 states cycle like this when clicked:
             // checked -> undetermined -> unchecked -> checked -> ...
         {
             // 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);
+            bool active = gtk_toggle_button_get_active(toggle) != 0;
+            bool inconsistent = gtk_toggle_button_get_inconsistent(toggle) != 0;

 
             cb->GTKDisableEvents();
 
 
             cb->GTKDisableEvents();
 


@@ -67,7 +68,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
             }
             else
             {
             }
             else
             {

-                wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!"));
+                wxFAIL_MSG(wxT("3state wxCheckBox in unexpected state!"));

             }
 
             cb->GTKEnableEvents();
             }
 
             cb->GTKEnableEvents();


@@ -90,8 +91,6 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
 // wxCheckBox
 //-----------------------------------------------------------------------------
 
 // wxCheckBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
-

 wxCheckBox::wxCheckBox()
 {
 }
 wxCheckBox::wxCheckBox()
 {
 }


@@ -105,6 +104,7 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString &name )
 {
                         const wxValidator& validator,
                         const wxString &name )
 {

+    WXValidateStyle( &style );

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -112,11 +112,6 @@ 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


@@ -137,7 +132,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     else
     {
         m_widgetCheckbox = gtk_check_button_new_with_label("");
     else
     {
         m_widgetCheckbox = gtk_check_button_new_with_label("");

-        m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child;
+        m_widgetLabel = gtk_bin_get_child(GTK_BIN(m_widgetCheckbox));

         m_widget = m_widgetCheckbox;
     }
     g_object_ref(m_widget);
         m_widget = m_widgetCheckbox;
     }
     g_object_ref(m_widget);


@@ -171,7 +166,7 @@ void wxCheckBox::SetValue( bool state )
 
     if (state == GetValue())
         return;
 
     if (state == GetValue())
         return;

- 
+

     GTKDisableEvents();
 
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
     GTKDisableEvents();
 
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );


@@ -183,7 +178,7 @@ 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_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));
+    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)) != 0;

 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)


@@ -217,28 +212,26 @@ void wxCheckBox::SetLabel( const wxString& label )
 
 bool wxCheckBox::Enable( bool enable )
 {
 
 bool wxCheckBox::Enable( bool enable )
 {

-    if ( !wxControl::Enable( enable ) )
+    if (!base_type::Enable(enable))

         return false;
 
     gtk_widget_set_sensitive( m_widgetLabel, enable );
 
         return false;
 
     gtk_widget_set_sensitive( m_widgetLabel, enable );
 

+    if (enable)
+        GTKFixSensitivity();
+

     return true;
 }
 
 void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     return true;
 }
 
 void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    gtk_widget_modify_style(m_widgetCheckbox, style);
-    gtk_widget_modify_style(m_widgetLabel, style);
+    GTKApplyStyle(m_widgetCheckbox, style);
+    GTKApplyStyle(m_widgetLabel, style);

 }
 
 GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
 }
 
 GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {

-    return GTK_BUTTON(m_widgetCheckbox)->event_window;
-}
-
-wxSize wxCheckBox::DoGetBestSize() const
-{
-    return wxControl::DoGetBestSize();
+    return gtk_button_get_event_window(GTK_BUTTON(m_widgetCheckbox));

 }
 
 // static
 }
 
 // static