X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64c502e828ebb1bb713cb8755c7bde77d41bea17..8a31648287be0ef976f133de2786b137f1e98340:/src/gtk/window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index f7ef4a6db0..1a3f1065b0 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -830,7 +830,8 @@ bool SendCharHookEvent(const wxKeyEvent& event, wxWindow *win)
     if ( !g_captureWindow )
     {
         wxKeyEvent eventCharHook(wxEVT_CHAR_HOOK, event);
-        if ( win->HandleWindowEvent(eventCharHook) )
+        if ( win->HandleWindowEvent(eventCharHook)
+                && !event.IsNextEventAllowed() )
             return true;
     }
 
@@ -2612,14 +2613,6 @@ void wxWindowGTK::OnInternalIdle()
         RealizeTabOrder();
     }
 
-    // Update style if the window was not yet realized when
-    // SetBackgroundStyle() was called
-    if (m_needsStyleChange)
-    {
-        SetBackgroundStyle(GetBackgroundStyle());
-        m_needsStyleChange = false;
-    }
-
     wxWindowBase::OnInternalIdle();
 }
 
@@ -3971,7 +3964,7 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
         }
         else // window not realized yet
         {
-            // Do in OnIdle, because the window is not yet available
+            // Do when window is realized
             m_needsStyleChange = true;
         }