better naming wxCFEventLoopPauseIdleEvents

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

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index a6d21769e56b48a337adf9b30e65bc4b31a39f31..8a7e8649e3245a4eea05187c51be47c0c671dff1 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -152,12 +152,14 @@ double wxSpinCtrlGTKBase::DoGetValue() const
     g_signal_emit(m_widget, sig_id, 0, &value, &handled);
     if (!handled)
         value = g_strtod(gtk_entry_get_text(GTK_ENTRY(m_widget)), NULL);
     g_signal_emit(m_widget, sig_id, 0, &value, &handled);
     if (!handled)
         value = g_strtod(gtk_entry_get_text(GTK_ENTRY(m_widget)), NULL);

-    const GtkAdjustment* adj =
+    GtkAdjustment* adj =

         gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(m_widget));
         gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(m_widget));

-    if (value < adj->lower)
-        value = adj->lower;
-    else if (value > adj->upper)
-        value = adj->upper;
+    const double lower = gtk_adjustment_get_lower(adj);
+    const double upper = gtk_adjustment_get_upper(adj);
+    if (value < lower)
+        value = lower;
+    else if (value > upper)
+        value = upper;

 
     return value;
 }
 
     return value;
 }


@@ -193,7 +195,7 @@ bool wxSpinCtrlGTKBase::GetSnapToTicks() const
 {
     wxCHECK_MSG(m_widget, false, "invalid spin button");
 
 {
     wxCHECK_MSG(m_widget, false, "invalid spin button");
 

-    return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) );
+    return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) ) != 0;

 }
 
 void wxSpinCtrlGTKBase::SetValue( const wxString& value )
 }
 
 void wxSpinCtrlGTKBase::SetValue( const wxString& value )


@@ -297,7 +299,7 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event )
             GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
             if ( window )
             {
             GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
             if ( window )
             {

-                GtkWidget *widgetDef = window->default_widget;
+                GtkWidget* widgetDef = gtk_window_get_default_widget(window);

 
                 if ( widgetDef )
                 {
 
                 if ( widgetDef )
                 {