tried to correct the colour problems

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 1901da14bfae646b99610b6e5c793629e0837b2d..2ecf6885e41b4af0baae4cb12dfe089c04e201f1 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/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"
@@ -98,10 +99,11 @@ bool wxSpinButton::Create(wxWindow *parent,
 {
     m_needParent = TRUE;
 
-    wxSize new_size = size;
-    new_size.x = 15;
+    wxSize new_size = size,
+           sizeBest = DoGetBestSize();
+    new_size.x = sizeBest.x;            // override width always
     if (new_size.y == -1)
-        new_size.y = 30;
+        new_size.y = sizeBest.y;
 
     if (!PreCreation( parent, pos, new_size ) ||
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
@@ -116,7 +118,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,10 +137,6 @@ bool wxSpinButton::Create(wxWindow *parent,
     return TRUE;
 }
 
-wxSpinButton::~wxSpinButton()
-{
-}
-
 int wxSpinButton::GetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
@@ -199,7 +198,7 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
-    m_width = 15;
+    m_width = DoGetBestSize().x;
     gtk_widget_set_usize( m_widget, m_width, m_height );
 }
 
@@ -214,4 +213,9 @@ void wxSpinButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+wxSize wxSpinButton::DoGetBestSize() const
+{
+    return wxSize(15, 26);
+}
+
 #endif