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 5098f9df827b1d732a44860f28e6e637d9a5b27c..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:
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:


@@ -8,21 +8,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_SPINBTN
+

 #include "wx/spinbutt.h"
 
 #include "wx/spinbutt.h"
 

-#if wxUSE_SPINBTN
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif

 
 

-#include "wx/utils.h"
-#include "wx/math.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

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


@@ -68,7 +66,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     event.SetPosition( value );
     event.SetEventObject( win );
 
     event.SetPosition( value );
     event.SetEventObject( win );
 

-    if ((win->GetEventHandler()->ProcessEvent( event )) &&
+    if ((win->HandleWindowEvent( event )) &&

         !event.IsAllowed() )
     {
         /* program has vetoed */
         !event.IsAllowed() )
     {
         /* program has vetoed */


@@ -96,7 +94,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
         wxSpinEvent event2( command, win->GetId());
         event2.SetPosition( value );
         event2.SetEventObject( win );
         wxSpinEvent event2( command, win->GetId());
         event2.SetPosition( value );
         event2.SetEventObject( win );

-        win->GetEventHandler()->ProcessEvent( event2 );
+        win->HandleWindowEvent( event2 );

     }
 }
 }
     }
 }
 }


@@ -119,7 +117,7 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
                           long style,
                           const wxString& name)
 {

-    m_needParent = TRUE;
+    m_needParent = true;

 
     wxSize new_size = size,
            sizeBest = DoGetBestSize();
 
     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") );
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -152,7 +150,7 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     PostCreation(new_size);
 
 
     PostCreation(new_size);
 

-    return TRUE;
+    return true;

 }
 
 int wxSpinButton::GetMin() const
 }
 
 int wxSpinButton::GetMin() const


@@ -241,4 +239,4 @@ wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_button_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_button_new);
 }
 

-#endif
+#endif // wxUSE_SPINBTN