ignore clicks on a toolbar but outside any button

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

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index f4458a75848e6a082078cee1eb60350ba8e921c5..c2091178b63987c2c67a1ee21b8ec28eea3d6034 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -18,6 +18,8 @@
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

+#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+

 #include <math.h>
 
 #include <gdk/gdk.h>
 #include <math.h>
 
 #include <gdk/gdk.h>


@@ -257,12 +259,20 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         wxWindow *top_frame = m_parent;
         while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel()))
             top_frame = top_frame->GetParent();
         wxWindow *top_frame = m_parent;
         while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel()))
             top_frame = top_frame->GetParent();

-        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);

 
 

-        if (window->default_widget)
+        if ( GTK_IS_WINDOW(top_frame->m_widget) )

         {
         {

-            gtk_widget_activate (window->default_widget);
-            return;
+            GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+            if ( window )
+            {
+                GtkWidget *widgetDef = window->default_widget;
+
+                if ( widgetDef && GTK_IS_WINDOW(widgetDef) )
+                {
+                    gtk_widget_activate(widgetDef);
+                    return;
+                }
+            }

         }
     }
 
         }
     }