VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 946a09a4132b96b687159e20d99f4ffcd7d251c3..2729438afb6606c88ba1b404194bf098738c5e72 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -30,7 +30,8 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;

 
 //-----------------------------------------------------------------------------
 // "clicked"
 
 //-----------------------------------------------------------------------------
 // "clicked"


@@ -42,12 +43,6 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
 
     if (!cb->m_hasVMT) return;
 
 
     if (!cb->m_hasVMT) return;
 

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

     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());


@@ -78,13 +73,12 @@ bool wxCheckBox::Create(wxWindow *parent,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 

-    PreCreation( parent, id, pos, size, style, name );
-
-    m_blockFirstEvent = FALSE;
-
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxCheckBox creation failed") );
+       return FALSE;
+    }

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


@@ -102,7 +96,6 @@ bool wxCheckBox::Create(wxWindow *parent,
         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_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);
 

-        // VZ: why do I have to do this to make them appear?

         gtk_widget_show( m_widgetLabel );
         gtk_widget_show( m_widgetCheckbox );
     }
         gtk_widget_show( m_widgetLabel );
         gtk_widget_show( m_widgetCheckbox );
     }


@@ -144,28 +137,33 @@ bool wxCheckBox::Create(wxWindow *parent,
 
 void wxCheckBox::SetValue( bool state )
 {
 
 void wxCheckBox::SetValue( bool state )
 {

-    wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") );
+    wxCHECK_RET( m_widgetCheckbox != NULL, wxT("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_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 );

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

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

 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {

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

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


@@ -189,4 +187,27 @@ void wxCheckBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
 }
 

+bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
+{
+    return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+}
+
+void wxCheckBox::OnInternalIdle()
+{
+    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();
+}
+

 #endif
 #endif