Use temp directory and don't prepend two backslashes, on WinCE

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 8b561f3929fd575c17c3e94ed1ec28a9141d4ce2..09a67f104b5eeed210a472abed80c45b685c04ae 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -45,10 +45,9 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;

-    
+

     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:
     // Transitions for 3state checkbox must be done manually, GTK's checkbox
     // is 2state with additional "undetermined state" flag which isn't
     // changed automatically:


@@ -64,7 +63,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
             bool inconsistent = gtk_toggle_button_get_inconsistent(toggle);
 
             cb->m_blockEvent = true;
             bool inconsistent = gtk_toggle_button_get_inconsistent(toggle);
 
             cb->m_blockEvent = true;

-            
+

             if (!active && !inconsistent)
             {
                 // checked -> undetermined
             if (!active && !inconsistent)
             {
                 // checked -> undetermined


@@ -85,7 +84,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
             {
                 wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!"));
             }
             {
                 wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!"));
             }

-            
+

             cb->m_blockEvent = false;
         }
         else
             cb->m_blockEvent = false;
         }
         else


@@ -94,14 +93,9 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
             gtk_toggle_button_set_inconsistent(toggle, false);
         }
     }
             gtk_toggle_button_set_inconsistent(toggle, false);
         }
     }

-#endif

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

-#ifdef __WXGTK20__

     event.SetInt(cb->Get3StateValue());
     event.SetInt(cb->Get3StateValue());

-#else
-    event.SetInt(cb->GetValue());
-#endif

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


@@ -162,15 +156,13 @@ 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 = BUTTON_CHILD( m_widgetCheckbox );
+        m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child;

         m_widget = m_widgetCheckbox;
     }
     SetLabel( label );
 
         m_widget = m_widgetCheckbox;
     }
     SetLabel( label );
 

-    gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
-                        "toggled",
-                        GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback),
-                        (gpointer *)this );
+    g_signal_connect (m_widgetCheckbox, "toggled",
+                      G_CALLBACK (gtk_checkbox_toggled_callback), this);

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


@@ -188,7 +180,7 @@ void wxCheckBox::SetValue( bool state )
 
     m_blockEvent = TRUE;
 
 
     m_blockEvent = TRUE;
 

-    gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );

 
     m_blockEvent = FALSE;
 }
 
     m_blockEvent = FALSE;
 }


@@ -197,14 +189,9 @@ 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));
     return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));

-#else
-    return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
-#endif

 }
 
 }
 

-#ifdef __WXGTK20__

 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
     SetValue(state != wxCHK_UNCHECKED);
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
     SetValue(state != wxCHK_UNCHECKED);


@@ -223,7 +210,6 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const
         return GetValue() ? wxCHK_CHECKED : wxCHK_UNCHECKED;
     }
 }
         return GetValue() ? wxCHK_CHECKED : wxCHK_UNCHECKED;
     }
 }

-#endif

 
 void wxCheckBox::SetLabel( const wxString& label )
 {
 
 void wxCheckBox::SetLabel( const wxString& label )
 {


@@ -250,7 +236,7 @@ void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
 {

-    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+    return window == GTK_BUTTON(m_widget)->event_window;

 }
 
 void wxCheckBox::OnInternalIdle()
 }
 
 void wxCheckBox::OnInternalIdle()


@@ -258,7 +244,7 @@ void wxCheckBox::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    GdkWindow *event_window = TOGGLE_BUTTON_EVENT_WIN(m_widgetCheckbox);
+    GdkWindow *event_window = GTK_BUTTON(m_widgetCheckbox)->event_window;

     if ( event_window && cursor.Ok() )
     {
         /* I now set the cursor the anew in every OnInternalIdle call
     if ( event_window && cursor.Ok() )
     {
         /* I now set the cursor the anew in every OnInternalIdle call


@@ -277,7 +263,7 @@ void wxCheckBox::OnInternalIdle()
             g_delayedFocus = NULL;
         }
     }
             g_delayedFocus = NULL;
         }
     }

-    
+

     if (wxUpdateUIEvent::CanUpdate(this))
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
     if (wxUpdateUIEvent::CanUpdate(this))
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }