X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e35ab96f64a0ad21470043492e0153980b95382..05e1201cb5943fb9c75f5612e9fb9323358edab5:/src/os2/window.cpp

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index daea0da4e1..605a5ade87 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1849,7 +1849,7 @@ void wxWindowOS2::GetTextExtent(
     int                             i;
     int                             l;
     FONTMETRICS                     vFM; // metrics structure
-    BOOL                            bRc;
+    BOOL                            bRc = FALSE;
     char*                           pStr;
     ERRORID                         vErrorCode; // last error id code
     HPS                             hPS;
@@ -1969,7 +1969,10 @@ static void wxYieldForCommandsOnly()
     while (::WinPeekMsg(vHabmain, &vMsg, (HWND)0, WM_COMMAND, WM_COMMAND, PM_REMOVE)
            && vMsg.msg != WM_QUIT)
     {
-        wxTheApp->DoMessage((WXMSG*)&vMsg);
+        // luckily (as we don't have access to wxEventLoopImpl method from here
+        // anyhow...) we don't need to pre process WM_COMMANDs so dispatch it
+        // immediately
+        ::WinDispatchMsg(vHabmain, &vMsg);
     }
     if (vMsg.msg == WM_QUIT)
         ::WinPostMsg(NULL, WM_QUIT, 0, 0);
@@ -3185,7 +3188,7 @@ bool wxWindowOS2::OS2Create(
     // which is the same but without CS_[HV]REDRAW class styles so using it
     // ensures that the window is not fully repainted on each resize
     //
-    if (GetWindowStyleFlag() & wxNO_FULL_REPAINT_ON_RESIZE)
+    if (!HasFlag(wxFULL_REPAINT_ON_RESIZE))
     {
         sClassName += wxT("NR");
     }