don't require multimon.h any more now (patch 1446030); enable wxUSE_DISPLAY by default

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 5098f9df827b1d732a44860f28e6e637d9a5b27c..52efbc9d4f7666950c1e14417bcd424a5eda24ff 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -8,11 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "spinbutt.h"
-    #pragma implementation "spinbutbase.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -24,13 +19,6 @@
 #include "wx/math.h"
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -74,16 +62,14 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
         /* program has vetoed */
         win->m_adjust->value = win->m_oldPos;
 
-        gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust),
-                                       (GtkSignalFunc) gtk_spinbutt_callback,
-                                       (gpointer) win );
+        g_signal_handlers_disconnect_by_func (win->m_adjust,
+                                              (gpointer) gtk_spinbutt_callback,
+                                              win);
 
-        gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+        g_signal_emit_by_name (win->m_adjust, "value_changed");
 
-        gtk_signal_connect( GTK_OBJECT (win->m_adjust),
-                            "value_changed",
-                            (GtkSignalFunc) gtk_spinbutt_callback,
-                            (gpointer) win );
+        g_signal_connect (win->m_adjust, "value_changed",
+                          G_CALLBACK (gtk_spinbutt_callback), win);
         return;
     }
 
@@ -143,10 +129,8 @@ bool wxSpinButton::Create(wxWindow *parent,
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );
 
-    gtk_signal_connect( GTK_OBJECT (m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_spinbutt_callback,
-                        (gpointer) this );
+    g_signal_connect (m_adjust, "value_changed",
+                      G_CALLBACK (gtk_spinbutt_callback), this);
 
     m_parent->DoAddChild( this );
 
@@ -186,7 +170,7 @@ void wxSpinButton::SetValue( int value )
 
     m_adjust->value = fpos;
 
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    g_signal_emit_by_name (m_adjust, "value_changed");
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
@@ -205,7 +189,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    g_signal_emit_by_name (m_adjust, "changed");
 
     // these two calls are required due to some bug in GTK
     Refresh();
@@ -217,7 +201,7 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
     m_width = DoGetBestSize().x;
-    gtk_widget_set_usize( m_widget, m_width, m_height );
+    gtk_widget_set_size_request( m_widget, m_width, m_height );
 }
 
 bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )