X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f09d8a3b940bbdfdc1907f1de97ba99e297a315c..03c046d1d521ebe253b612838eef5af8b5220365:/src/os2/app.cpp diff --git a/src/os2/app.cpp b/src/os2/app.cpp index f03a8e20ed..ef18d55511 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -184,7 +184,7 @@ bool wxApp::RegisterWindowClasses( if (!::WinRegisterClass( vHab ,wxFrameClassName ,(PFNWP)wxWndProc - ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT + ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT | CS_FRAME ,sizeof(ULONG) )) { @@ -651,11 +651,11 @@ int wxApp::MainLoop() #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - while (!Pending() && ProcessIdle()) - { -// wxUsleep(10000); - } - DoMessage(); + while (!Pending() && ProcessIdle()) + { +// wxUsleep(10000); + } + DoMessage(); } return (int)svCurrentMsg.mp1; } // end of wxApp::MainLoop @@ -747,11 +747,11 @@ bool wxApp::ProcessMessage( if(!(CHARMSG(pChmsg)->fs & KC_KEYUP)) { if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0) - CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)usch); + CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch); for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() ) { - if(pWnd->OS2TranslateMessage(pWxmsg)) + if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE) break; } if(!bRc) // untranslated, should restore original value @@ -761,11 +761,11 @@ bool wxApp::ProcessMessage( // // Anyone for a non-translation message? Try youngest descendants first. // - for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent()) - { - if (pWnd->OS2ProcessMessage(pWxmsg)) - return TRUE; - } +// for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent()) +// { +// if (pWnd->OS2ProcessMessage(pWxmsg)) +// return TRUE; +// } return FALSE; } // end of wxApp::ProcessMessage