wxFileSystem now compiles if wxUSE_HTML (required by wxHTML)

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

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index d7bbb53e30baffad4e1ace13c2fa3f6f3323cc91..439794f54584c4176409d23b020f7f90f1c1bf3a 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -75,15 +75,18 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
-    wxSize new_size = size;
+    wxSize new_size = size,
+           sizeBest = DoGetBestSize();
+    if (new_size.x == -1)
+        new_size.x = sizeBest.x;
     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 ))
     {
         wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );
-       return FALSE;
+        return FALSE;
     }
 
     m_oldPos = initial;
@@ -196,13 +199,13 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         wxWindow *top_frame = m_parent;
         while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
             top_frame = top_frame->GetParent();
-       GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
 
-       if (window->default_widget)
+        if (window->default_widget)
         {
             gtk_widget_activate (window->default_widget);
-           return;
-       }
+            return;
+        }
     }
 
     event.Skip();
@@ -219,5 +222,10 @@ void wxSpinCtrl::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+wxSize wxSpinCtrl::DoGetBestSize() const
+{
+    return wxSize(95, 26);
+}
+
 #endif
    // wxUSE_SPINCTRL