Updates to (behaviour of) wxComboBox and wxSpinCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 3cd992283dc03bf70c57b9f640342acd514416e3..55cbde698363aeec9f4c5ec70f13234b958376e5 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -601,29 +601,29 @@ void wxComboBox::OnChar( wxKeyEvent &event )
                 event.SetEventObject( this );
                 GetEventHandler()->ProcessEvent( event );
             }
                 event.SetEventObject( this );
                 GetEventHandler()->ProcessEvent( event );
             }

-            else
-            {
-                // This will invoke the dialog default action, such
-                // as the clicking the default button.
+
+            // This will invoke the dialog default action, such
+            // as the clicking the default button.
+
+            wxWindow *top_frame = m_parent;
+            while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+            top_frame = top_frame->GetParent();

     
     

-                wxWindow *top_frame = m_parent;
-                while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-                top_frame = top_frame->GetParent();
-        
-                if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
-                {
-                    GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+            if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+            {
+                GtkWindow *window = GTK_WINDOW(top_frame->m_widget);

 
 

-                    if (window->default_widget)
-                    {
-                        gtk_widget_activate (window->default_widget);
-                        return;
-                    }
+                if (window->default_widget)
+                {
+                    gtk_widget_activate (window->default_widget);
+                    return;

                 }
             }
                 }
             }

+            
+            return;

         }
     }
         }
     }

-
+    

     event.Skip();
 }
 
     event.Skip();
 }
 

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 46e8f4860f188df2761d0e6bd91026a8b4e9a5d3..87acf9dcb64576e7f02bebfbde103425fddf857f 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -77,7 +77,9 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );

-    event.SetInt( win->GetValue() );
+    
+    // see above
+    event.SetInt( (int)ceil(win->m_adjust->value) );

     win->GetEventHandler()->ProcessEvent( event );
 }
 
     win->GetEventHandler()->ProcessEvent( event );
 }
 

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 3cd992283dc03bf70c57b9f640342acd514416e3..55cbde698363aeec9f4c5ec70f13234b958376e5 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -601,29 +601,29 @@ void wxComboBox::OnChar( wxKeyEvent &event )
                 event.SetEventObject( this );
                 GetEventHandler()->ProcessEvent( event );
             }
                 event.SetEventObject( this );
                 GetEventHandler()->ProcessEvent( event );
             }

-            else
-            {
-                // This will invoke the dialog default action, such
-                // as the clicking the default button.
+
+            // This will invoke the dialog default action, such
+            // as the clicking the default button.
+
+            wxWindow *top_frame = m_parent;
+            while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+            top_frame = top_frame->GetParent();

     
     

-                wxWindow *top_frame = m_parent;
-                while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-                top_frame = top_frame->GetParent();
-        
-                if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
-                {
-                    GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+            if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+            {
+                GtkWindow *window = GTK_WINDOW(top_frame->m_widget);

 
 

-                    if (window->default_widget)
-                    {
-                        gtk_widget_activate (window->default_widget);
-                        return;
-                    }
+                if (window->default_widget)
+                {
+                    gtk_widget_activate (window->default_widget);
+                    return;

                 }
             }
                 }
             }

+            
+            return;

         }
     }
         }
     }

-
+    

     event.Skip();
 }
 
     event.Skip();
 }
 

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 46e8f4860f188df2761d0e6bd91026a8b4e9a5d3..87acf9dcb64576e7f02bebfbde103425fddf857f 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -77,7 +77,9 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );

-    event.SetInt( win->GetValue() );
+    
+    // see above
+    event.SetInt( (int)ceil(win->m_adjust->value) );

     win->GetEventHandler()->ProcessEvent( event );
 }
 
     win->GetEventHandler()->ProcessEvent( event );
 }