Fix best size computation for buttons without image and with empty label.

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

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 4ac29c9c25293162939e072286cef309c8dc3e65..250fda3d2a018303270313a435b2a6e102876601 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        spinbutt.cpp
+// Name:        src/gtk1/spinbutt.cpp
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:
@@ -8,23 +8,19 @@
 // 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"
 
-#include "wx/spinbutt.h"
-
 #if wxUSE_SPINBTN
 
-#include "wx/utils.h"
+#include "wx/spinbutt.h"
 
-#include <math.h>
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif
 
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -45,6 +41,7 @@ static const float sensitivity = 0.02;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
@@ -69,27 +66,27 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     event.SetPosition( value );
     event.SetEventObject( win );
 
-    if ((win->GetEventHandler()->ProcessEvent( event )) &&
+    if ((win->HandleWindowEvent( event )) &&
         !event.IsAllowed() )
     {
         /* 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 );
-        
+                                       (GtkSignalFunc) gtk_spinbutt_callback,
+                                       (gpointer) win );
+
         gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
 
         gtk_signal_connect( GTK_OBJECT (win->m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_spinbutt_callback,
-                        (gpointer) win );
+                            "value_changed",
+                            (GtkSignalFunc) gtk_spinbutt_callback,
+                            (gpointer) win );
         return;
     }
-    
+
     win->m_oldPos = win->m_adjust->value;
-    
+
     /* always send a thumbtrack event */
     if (command != wxEVT_SCROLL_THUMBTRACK)
     {
@@ -97,9 +94,10 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
         wxSpinEvent event2( command, win->GetId());
         event2.SetPosition( value );
         event2.SetEventObject( win );
-        win->GetEventHandler()->ProcessEvent( event2 );
+        win->HandleWindowEvent( event2 );
     }
 }
+}
 
 //-----------------------------------------------------------------------------
 // wxSpinButton
@@ -119,7 +117,7 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 
     wxSize new_size = size,
            sizeBest = DoGetBestSize();
@@ -131,7 +129,7 @@ bool wxSpinButton::Create(wxWindow *parent,
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );
-           return FALSE;
+        return false;
     }
 
     m_oldPos = 0.0;
@@ -152,7 +150,7 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     PostCreation(new_size);
 
-    return TRUE;
+    return true;
 }
 
 int wxSpinButton::GetMin() const
@@ -206,7 +204,7 @@ 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();
@@ -241,4 +239,4 @@ wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_button_new);
 }
 
-#endif
+#endif // wxUSE_SPINBTN