fixed MDI accel bug, more tests for it in the sample

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

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 9e51422831dd85d04c741b0666d345ea896a85e9..db68c07d703098e78441398aa36108ad5387714e 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -97,8 +97,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );


@@ -107,6 +105,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
         new_size.x = size_best.x;
     if (new_size.y == -1)
         new_size.y = size_best.y;
         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 );
 
     if ((new_size.x != size.x) || (new_size.y != size.y))
         SetSize( new_size.x, new_size.y );
 


@@ -222,7 +222,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
     if (event.KeyCode() == WXK_RETURN)
     {
         wxWindow *top_frame = m_parent;
     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);
 
             top_frame = top_frame->GetParent();
         GtkWindow *window = GTK_WINDOW(top_frame->m_widget);