added test mode to wxLongLongWx which allowed to find the bug in operator*=()

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

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 58e83b7df77025663bbe7a7e70f498fe97c3efa3..2ecf6885e41b4af0baae4cb12dfe089c04e201f1 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -17,10 +17,11 @@
 #ifdef wxUSE_SPINBTN
 
 #include "wx/utils.h"
 #ifdef wxUSE_SPINBTN
 
 #include "wx/utils.h"

+

 #include <math.h>
 
 #include <math.h>
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -98,10 +99,11 @@ bool wxSpinButton::Create(wxWindow *parent,
 {
     m_needParent = TRUE;
 
 {
     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)
     if (new_size.y == -1)

-        new_size.y = 26;
+        new_size.y = sizeBest.y;

 
     if (!PreCreation( parent, pos, new_size ) ||
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
 
     if (!PreCreation( parent, pos, new_size ) ||
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))


@@ -196,7 +198,7 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
 {
     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 );
 }
 
     gtk_widget_set_usize( m_widget, m_width, m_height );
 }
 


@@ -211,4 +213,9 @@ void wxSpinButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

+wxSize wxSpinButton::DoGetBestSize() const
+{
+    return wxSize(15, 26);
+}
+

 #endif
 #endif