X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d9b77552eeb78e0c7ee903aa265dc187651ff57..4dff340069297c51f04fcd230282b86eee6943db:/src/gtk/spinctrl.cpp

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 439794f545..db68c07d70 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -75,15 +75,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
-    wxSize new_size = size,
-           sizeBest = DoGetBestSize();
-    if (new_size.x == -1)
-        new_size.x = sizeBest.x;
-    if (new_size.y == -1)
-        new_size.y = sizeBest.y;
-
-    if (!PreCreation( parent, pos, new_size ) ||
-        !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );
         return FALSE;
@@ -94,19 +87,29 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0);
 
     m_widget = gtk_spin_button_new( m_adjust, 1, 0 );
-
+    
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );
 
-    gtk_signal_connect( GTK_OBJECT (m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_spinctrl_callback,
-                        (gpointer) this );
-
+    GtkEnableEvents();
+    
     m_parent->DoAddChild( this );
 
     PostCreation();
 
+    SetFont( parent->GetFont() );
+    
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = size_best.x;
+    if (new_size.y == -1)
+        new_size.y = size_best.y;
+    if (new_size.y > size_best.y)
+        new_size.y = size_best.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     SetValue( value );
@@ -116,6 +119,22 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     return TRUE;
 }
 
+void wxSpinCtrl::GtkDisableEvents()
+{
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
+                        GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
+                        (gpointer) this );
+
+}
+
+void wxSpinCtrl::GtkEnableEvents()
+{
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
+                        "value_changed",
+                        GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
+                        (gpointer) this );
+}
+
 int wxSpinCtrl::GetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
@@ -134,6 +153,8 @@ int wxSpinCtrl::GetValue() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
+    gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
+
     return (int)ceil(m_adjust->value);
 }
 
@@ -150,7 +171,9 @@ void wxSpinCtrl::SetValue( const wxString& value )
     else
     {
         // invalid number - set text as is (wxMSW compatible)
+        GtkDisableEvents();
         gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() );
+        GtkEnableEvents();
     }
 }
 
@@ -164,7 +187,9 @@ void wxSpinCtrl::SetValue( int value )
 
     m_adjust->value = fpos;
 
+    GtkDisableEvents();
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    GtkEnableEvents();
 }
 
 void wxSpinCtrl::SetRange(int minVal, int maxVal)
@@ -197,7 +222,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
     if (event.KeyCode() == WXK_RETURN)
     {
         wxWindow *top_frame = m_parent;
-        while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
+        while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel()))
             top_frame = top_frame->GetParent();
         GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
 
@@ -224,7 +249,8 @@ void wxSpinCtrl::ApplyWidgetStyle()
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
-    return wxSize(95, 26);
+    wxSize ret( wxControl::DoGetBestSize() );
+    return wxSize(95, ret.y);
 }
 
 #endif