X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c76fb545702ddd676d6c6a653a68f007719bd038..4209475ced5240eb3ce516767e7c9a0a74d12bc7:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index eccd8787f4..50df7cdeff 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -122,7 +122,7 @@ extern void wxSetKeyboardHook(bool doIt); struct ClassRegInfo { // the base name of the class: this is used to construct the unique name in - // RegisterClassWithUniqueNames() + // wxApp::GetRegisteredClassName() wxString basename; // the name of the registered class with and without CS_[HV]REDRAW styles @@ -396,7 +396,7 @@ private: GetConsoleCommandHistory_t m_pfnGetConsoleCommandHistory; GetConsoleCommandHistoryLength_t m_pfnGetConsoleCommandHistoryLength; - DECLARE_NO_COPY_CLASS(wxConsoleStderr) + wxDECLARE_NO_COPY_CLASS(wxConsoleStderr); }; bool wxConsoleStderr::DoInit() @@ -1011,58 +1011,6 @@ int wxApp::GetShell32Version() #endif // !__WXWINCE__ -// ---------------------------------------------------------------------------- -// Yield to incoming messages -// ---------------------------------------------------------------------------- - -bool wxApp::Yield(bool onlyIfNeeded) -{ - if ( m_isInsideYield ) - { - if ( !onlyIfNeeded ) - { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); - } - - return false; - } - - // set the flag and don't forget to reset it before returning - m_isInsideYield = true; - wxON_BLOCK_EXIT_SET(m_isInsideYield, false); - - -#if wxUSE_LOG - // disable log flushing from here because a call to wxYield() shouldn't - // normally result in message boxes popping up &c - wxLog::Suspend(); - - // ensure the logs will be flashed again when we exit - wxON_BLOCK_EXIT0(wxLog::Resume); -#endif // wxUSE_LOG - - - // we don't want to process WM_QUIT from here - it should be processed in - // the main event loop in order to stop it - wxEventLoopGuarantor dummyLoopIfNeeded; - MSG msg; - while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) && - msg.message != WM_QUIT ) - { -#if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); -#endif // wxUSE_THREADS - - if ( !wxTheApp->Dispatch() ) - break; - } - - // if there are pending events, we must process them. - ProcessPendingEvents(); - - return true; -} - #if wxUSE_EXCEPTIONS // ----------------------------------------------------------------------------