X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/376ef4a1f497822dd6e0de572e2d59ea192a7380..f21fcc9d2e6ba3e02a686b4ed11102fdcc4c49bb:/src/os2/window.cpp

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index d88927fcae..96931c33eb 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -2234,6 +2234,8 @@ static void wxYieldForCommandsOnly()
     {
         wxTheApp->DoMessage((WXMSG*)&vMsg);
     }
+    if (vMsg.msg == WM_QUIT)
+        ::WinPostMsg(NULL, WM_QUIT, 0, 0);
 }
 #endif // wxUSE_MENUS_NATIVE
 
@@ -2427,6 +2429,14 @@ bool wxWindowOS2::OS2ProcessMessage(
                                 pBtn->OS2Command(BN_CLICKED, 0 /* unused */);
                                 return TRUE;
                             }
+                            else if (!IsTopLevel())
+                            {
+                                //
+                                // if not a top level window, let parent
+                                // handle it
+                                //
+                                return FALSE;
+                            }
                             // else: but if it does not it makes sense to make
                             //       it work like a TAB - and that's what we do.
                             //       Note that Ctrl-Enter always works this way.