X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6380910c1fcd57f06c82d3d0d3c796a5af9f3ac7..051b55ad8ba1efe5f7c16c430131d4cd1b5fb90e:/src/gtk/spinbutt.cpp

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 044f6270e3..e582670902 100644
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -19,6 +19,13 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -33,6 +40,8 @@ static const float sensitivity = 0.2;
 
 static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (!win->HasVMT()) return;
     if (g_blockEventsOnDrag) return;
 
@@ -51,7 +60,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
-    int value = ceil(win->m_adjust->value);
+    int value = (int)ceil(win->m_adjust->value);
 
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
@@ -81,7 +90,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     m_needParent = TRUE;
 
     wxSize new_size = size;
-    new_size.x = 16;
+    new_size.x = 15;
     if (new_size.y == -1)
         new_size.y = 30;
 
@@ -121,28 +130,28 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetMin() const
 {
-    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
 
-    return ceil(m_adjust->lower);
+    return (int)ceil(m_adjust->lower);
 }
 
 int wxSpinButton::GetMax() const
 {
-    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
 
-    return ceil(m_adjust->upper);
+    return (int)ceil(m_adjust->upper);
 }
 
 int wxSpinButton::GetValue() const
 {
-    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
 
-    return ceil(m_adjust->value);
+    return (int)ceil(m_adjust->value);
 }
 
 void wxSpinButton::SetValue( int value )
 {
-    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+    wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
 
     float fpos = (float)value;
     m_oldPos = fpos;
@@ -155,7 +164,7 @@ void wxSpinButton::SetValue( int value )
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
-    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+    wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
 
     float fmin = (float)minVal;
     float fmax = (float)maxVal;
@@ -174,9 +183,9 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+    wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
 
-    m_width = 16;
+    m_width = 15;
     gtk_widget_set_usize( m_widget, m_width, m_height );
 }
 
@@ -201,5 +210,3 @@ wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
   wxScrollEvent(commandType, id)
 {
 }
-
-