X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e65cc56a3b275ef24ab117dfcd84b75dd33ab66f..487c1f7ef2ad59cf8ed6d8aca317d20304ca27bd:/src/gtk1/spinbutt.cpp

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 898eb4f4b9..f95ee16dc8 100644
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -17,10 +17,11 @@
 #ifdef wxUSE_SPINBTN
 
 #include "wx/utils.h"
+
 #include <math.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -35,7 +36,7 @@ extern bool g_isIdle;
 
 extern bool   g_blockEventsOnDrag;
 
-static const float sensitivity = 0.2;
+static const float sensitivity = 0.02;
 
 //-----------------------------------------------------------------------------
 // "value_changed"
@@ -101,12 +102,12 @@ bool wxSpinButton::Create(wxWindow *parent,
     wxSize new_size = size;
     new_size.x = 15;
     if (new_size.y == -1)
-        new_size.y = 30;
+        new_size.y = 26;
 
     if (!PreCreation( parent, pos, new_size ) ||
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
-        wxFAIL_MSG( _T("wxXX creation failed") );
+        wxFAIL_MSG( wxT("wxXX creation failed") );
 	return FALSE;
     }
 
@@ -116,7 +117,8 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
 
-    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
+    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
+                              (int)(m_windowStyle & wxSP_WRAP) );
 
     gtk_signal_connect( GTK_OBJECT (m_adjust),
                         "value_changed",
@@ -134,34 +136,30 @@ bool wxSpinButton::Create(wxWindow *parent,
     return TRUE;
 }
 
-wxSpinButton::~wxSpinButton()
-{
-}
-
 int wxSpinButton::GetMin() const
 {
-    wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
     return (int)ceil(m_adjust->lower);
 }
 
 int wxSpinButton::GetMax() const
 {
-    wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
     return (int)ceil(m_adjust->upper);
 }
 
 int wxSpinButton::GetValue() const
 {
-    wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
     return (int)ceil(m_adjust->value);
 }
 
 void wxSpinButton::SetValue( int value )
 {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
     float fpos = (float)value;
     m_oldPos = fpos;
@@ -174,7 +172,7 @@ void wxSpinButton::SetValue( int value )
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
     float fmin = (float)minVal;
     float fmax = (float)maxVal;
@@ -189,11 +187,15 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
     m_adjust->upper = fmax;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    
+    // these two calls are required due to some bug in GTK
+    Refresh();
+    SetFocus();
 }
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
     m_width = 15;
     gtk_widget_set_usize( m_widget, m_width, m_height );