X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40bab631d2020265f7d0e5e872a2925757bc92aa..7e559cd8f46964e3f6c4e4d210f3822591903123:/src/gtk/window.cpp?ds=inline

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 14a770ef10..a461e3b7e8 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -251,16 +251,6 @@ static bool g_activeFrameLostFocus = FALSE;
 // yet, defer setting the focus to idle time.
 wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
 
-// When GTK+ focus_in/out signal is being processed, we shouldn't do
-// any focus changes
-static bool gs_inFocusSignalHandler = false;
-
-struct InFocusHandlerLock
-{
-    InFocusHandlerLock() { gs_inFocusSignalHandler = true; }
-    ~InFocusHandlerLock() { gs_inFocusSignalHandler = false; }
-};
-
 // if we detect that the app has got/lost the focus, we set this variable to
 // either TRUE or FALSE and an activate event will be sent during the next
 // OnIdle() call and it is reset to -1: this value means that we shouldn't
@@ -1973,8 +1963,6 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget,
                                           GdkEvent *WXUNUSED(event),
                                           wxWindow *win )
 {
-    InFocusHandlerLock flock;
-
     DEBUG_MAIN_THREAD
 
     if (g_isIdle)
@@ -2069,8 +2057,6 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget,
 static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
 {
     DEBUG_MAIN_THREAD
-    
-    InFocusHandlerLock flock;
 
     if (g_isIdle)
         wxapp_install_idle_handler();
@@ -3622,14 +3608,6 @@ void wxWindowGTK::SetFocus()
         return;
     }
 
-    if (gs_inFocusSignalHandler)
-    {
-        wxLogTrace(TRACE_FOCUS,
-                   _T("in focus handler, delaying SetFocus(%p)"), this);
-        g_delayedFocus = this;
-        return;
-    }
-
     if (m_wxwindow)
     {
         if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))
@@ -4252,6 +4230,9 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle)
         DoApplyWidgetStyle(style);
         gtk_rc_style_unref(style);
     }
+
+    // Style change may affect GTK+'s size calculation:
+    InvalidateBestSize();
 }
 
 void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -4323,10 +4304,10 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
     bool is_waiting = true;
 
-    gtk_signal_connect( GTK_OBJECT(menu->m_menu),
-                        "hide",
-                        GTK_SIGNAL_FUNC(gtk_pop_hide_callback),
-                        (gpointer)&is_waiting );
+    gulong handler = gtk_signal_connect( GTK_OBJECT(menu->m_menu),
+                                         "hide",
+                                         GTK_SIGNAL_FUNC(gtk_pop_hide_callback),
+                                         (gpointer)&is_waiting );
 
     wxPoint pos;
     gpointer userdata;
@@ -4363,6 +4344,8 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
         gtk_main_iteration();
     }
 
+    gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler);
+
     return true;
 }