VC6 compilation fix for native wxProgressDialog implementation.

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index d984b94865c26e02de9d0b3b1a6d8e3dec64ea28..52d99fe5698201a1f86a43ed0cf8e3266a8f2d44 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>

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


@@ -29,14 +29,10 @@ extern bool           g_blockEventsOnDrag;
 extern "C" {
 static void gtk_checkbox_toggled_callback(GtkWidget *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;
 
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
 

-    if (cb->m_blockEvent) return;
-

     // Transitions for 3state checkbox must be done manually, GTK's checkbox
     // is 2state with additional "undetermined state" flag which isn't
     // changed automatically:
     // Transitions for 3state checkbox must be done manually, GTK's checkbox
     // is 2state with additional "undetermined state" flag which isn't
     // changed automatically:


@@ -51,7 +47,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
             bool active = gtk_toggle_button_get_active(toggle);
             bool inconsistent = gtk_toggle_button_get_inconsistent(toggle);
 
             bool active = gtk_toggle_button_get_active(toggle);
             bool inconsistent = gtk_toggle_button_get_inconsistent(toggle);
 

-            cb->m_blockEvent = true;
+            cb->GTKDisableEvents();

 
             if (!active && !inconsistent)
             {
 
             if (!active && !inconsistent)
             {


@@ -71,10 +67,10 @@ 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->m_blockEvent = false;
+            cb->GTKEnableEvents();

         }
         else
         {
         }
         else
         {


@@ -86,7 +82,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     event.SetInt(cb->Get3StateValue());
     event.SetEventObject(cb);
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     event.SetInt(cb->Get3StateValue());
     event.SetEventObject(cb);

-    cb->GetEventHandler()->ProcessEvent(event);
+    cb->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


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

-    m_needParent = true;
-    m_blockEvent = false;
-

     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 ))
     {


@@ -147,6 +140,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child;
         m_widget = m_widgetCheckbox;
     }
         m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child;
         m_widget = m_widgetCheckbox;
     }

+    g_object_ref(m_widget);

     SetLabel( label );
 
     g_signal_connect (m_widgetCheckbox, "toggled",
     SetLabel( label );
 
     g_signal_connect (m_widgetCheckbox, "toggled",


@@ -159,6 +153,18 @@ bool wxCheckBox::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

+void wxCheckBox::GTKDisableEvents()
+{
+    g_signal_handlers_block_by_func(m_widgetCheckbox,
+        (gpointer) gtk_checkbox_toggled_callback, this);
+}
+
+void wxCheckBox::GTKEnableEvents()
+{
+    g_signal_handlers_unblock_by_func(m_widgetCheckbox,
+        (gpointer) gtk_checkbox_toggled_callback, this);
+}
+

 void wxCheckBox::SetValue( bool state )
 {
     wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") );
 void wxCheckBox::SetValue( bool state )
 {
     wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") );


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

-    m_blockEvent = true;
+    GTKDisableEvents();

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

-    m_blockEvent = false;
+    GTKEnableEvents();

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


@@ -211,11 +217,14 @@ 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;
 }
 
     return true;
 }
 


@@ -230,11 +239,6 @@ GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
     return GTK_BUTTON(m_widgetCheckbox)->event_window;
 }
 
     return GTK_BUTTON(m_widgetCheckbox)->event_window;
 }
 

-wxSize wxCheckBox::DoGetBestSize() const
-{
-    return wxControl::DoGetBestSize();
-}
-

 // static
 wxVisualAttributes
 wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))