X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e78c4d503ecd57835502fb1bbd13a71cb99019d0..38755449339718307f594d0c92f7d37ce56c908c:/src/os2/app.cpp diff --git a/src/os2/app.cpp b/src/os2/app.cpp index f4f9a25d9c..7288a6e08c 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -27,8 +27,9 @@ #include "wx/msgdlg.h" #include "wx/intl.h" #include "wx/dynarray.h" -# include "wx/wxchar.h" -# include "wx/icon.h" + #include "wx/wxchar.h" + #include "wx/icon.h" + #include "wx/timer.h" #endif #include "wx/log.h" @@ -51,6 +52,10 @@ #include "wx/resource.h" #endif +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif // wxUSE_TOOLTIPS + #include #include @@ -59,18 +64,14 @@ // --------------------------------------------------------------------------- extern wxChar* wxBuffer; -extern wxChar* wxOsVersion; extern wxList* wxWinHandleList; extern wxList WXDLLEXPORT wxPendingDelete; -extern void wxSetKeyboardHook(bool doIt); extern wxCursor* g_globalCursor; -HINSTANCE wxhInstance = 0; +HAB vHabmain = NULLHANDLE; QMSG svCurrentMsg; wxApp* wxTheApp = NULL; -// FIXME why not const? and not static? - // NB: all "NoRedraw" classes must have the same names as the "normal" classes // with NR suffix - wxWindow::OS2Create() supposes this wxChar wxFrameClassName[] = wxT("wxFrameClass"); @@ -92,7 +93,8 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; HBRUSH wxDisableButtonBrush = (HBRUSH) 0; -MRESULT wxWndProc(HWND, UINT, MPARAM, MPARAM); +MRESULT EXPENTRY wxWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2); +MRESULT EXPENTRY wxFrameWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2); // =========================================================================== // implementation @@ -102,7 +104,6 @@ MRESULT wxWndProc(HWND, UINT, MPARAM, MPARAM); // wxApp // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) @@ -110,13 +111,46 @@ MRESULT wxWndProc(HWND, UINT, MPARAM, MPARAM); EVT_END_SESSION(wxApp::OnEndSession) EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif -//// Initialize +// +// Initialize +// bool wxApp::Initialize( HAB vHab ) { +#if defined(wxUSE_CONSOLEDEBUG) + #if wxUSE_CONSOLEDEBUG +/***********************************************/ +/* Code for using stdout debug */ +/* To use it you mast link app as "Window" - EK*/ +/***********************************************/ + { + PPIB pib; + PTIB tib; + + printf("In console\n"); + + DosGetInfoBlocks(&tib, &pib); +/* Try morphing into a PM application. */ +// if(pib->pib_ultype == 2) /* VIO */ + pib->pib_ultype = 3; + } +/**********************************************/ +/**********************************************/ + #endif //wxUSE_CONSOLEDEBUG +#endif + + // + // OS2 has to have an anchorblock + // + vHab = WinInitialize(0); + + if (!vHab) + return FALSE; + else + vHabmain = vHab; + // Some people may wish to use this, but // probably it shouldn't be here by default. #ifdef __WXDEBUG__ @@ -127,12 +161,10 @@ bool wxApp::Initialize( wxClassInfo::InitializeClasses(); -#if wxUSE_RESOURCES - wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); +#if wxUSE_THREADS + wxPendingEventsLocker = new wxCriticalSection; #endif - // I'm annoyed ... I don't know where to put this and I don't want to - // create a module for that as it's part of the core. wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); wxTheColourDatabase->Initialize(); @@ -145,183 +177,184 @@ bool wxApp::Initialize( wxBitmap::InitStandardHandlers(); - g_globalCursor = new wxCursor; - -#if 0 - wxSTD_FRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_FRAME"), TRUE); - wxSTD_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDIPARENTFRAME"), TRUE); - wxSTD_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDICHILDFRAME"), TRUE); - - wxDEFAULT_FRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_FRAME"), TRUE); - wxDEFAULT_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDIPARENTFRAME"), TRUE); - wxDEFAULT_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDICHILDFRAME"), TRUE); -#endif RegisterWindowClasses(vHab); wxWinHandleList = new wxList(wxKEY_INTEGER); // This is to foil optimizations in Visual C++ that throw out dummy.obj. // PLEASE DO NOT ALTER THIS. -#if !defined(WXMAKINGDLL) +#if !defined(WXMAKINGDLL) && defined(__VISAGECPP__) extern char wxDummyChar; if (wxDummyChar) wxDummyChar++; #endif - wxSetKeyboardHook(TRUE); + // wxSetKeyboardHook(TRUE); wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; return TRUE; -} +} // end of wxApp::Initialize +const char* CANTREGISTERCLASS = " Can't register Class "; // --------------------------------------------------------------------------- // RegisterWindowClasses // --------------------------------------------------------------------------- -// TODO we should only register classes really used by the app. For this it -// would be enough to just delay the class registration until an attempt -// to create a window of this class is made. bool wxApp::RegisterWindowClasses( HAB vHab ) { + APIRET rc; + ERRORID vError = 0L; + wxString sError; if (!::WinRegisterClass( vHab ,wxFrameClassName - ,(PFNWP)wxWndProc - ,CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME - ,0 + ,wxFrameWndProc + ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT | CS_CLIPCHILDREN + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(frame)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxFrameClassNameNoRedraw - ,(PFNWP)wxWndProc - ,CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME + ,wxWndProc ,0 + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(no redraw frame)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIFrameClassName - ,(PFNWP)wxWndProc - ,CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME - ,0 + ,wxWndProc + ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(MDI parent)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIFrameClassNameNoRedraw - ,(PFNWP)wxWndProc - ,CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME + ,wxWndProc ,0 + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(no redraw MDI parent)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIChildFrameClassName - ,(PFNWP)wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST | CS_CLIPSIBLINGS | CS_FRAME - ,0 + ,wxWndProc + ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(MDI child)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIChildFrameClassNameNoRedraw - ,(PFNWP)wxWndProc - ,CS_HITTEST | CS_CLIPSIBLINGS | CS_FRAME - ,0 + ,wxWndProc + ,CS_HITTEST + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(no redraw MDI child)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxPanelClassName - ,(PFNWP)wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_CLIPSIBLINGS | CS_SAVEBITS | CS_SYNCPAINT - ,0 + ,wxWndProc + ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(Panel)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxCanvasClassName - ,(PFNWP)wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_CLIPSIBLINGS | CS_SAVEBITS | CS_SYNCPAINT - ,0 + ,wxWndProc + ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT | CS_CLIPCHILDREN + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(Canvas)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } return TRUE; -} - -//// Cleans up any wxWindows internal structures left lying around +} // end of wxApp::RegisterWindowClasses +// +// Cleans up any wxWindows internal structures left lying around +// void wxApp::CleanUp() { - //// COMMON CLEANUP + // + // COMMON CLEANUP + // #if wxUSE_LOG - // flush the logged messages if any and install a 'safer' log target: the + + // + // Flush the logged messages if any and install a 'safer' log target: the // default one (wxLogGui) can't be used after the resources are freed just // below and the user suppliedo ne might be even more unsafe (using any // wxWindows GUI function is unsafe starting from now) + // wxLog::DontCreateOnDemand(); - // this will flush the old messages if any + // + // This will flush the old messages if any + // delete wxLog::SetActiveTarget(new wxLogStderr); #endif // wxUSE_LOG + // // One last chance for pending objects to be cleaned up + // wxTheApp->DeletePendingObjects(); wxModule::CleanUpModules(); #if wxUSE_WX_RESOURCES wxCleanUpResourceSystem(); - - // wxDefaultResourceTable->ClearTable(); #endif - // Indicate that the cursor can be freed, so that cursor won't be deleted - // by deleting the bitmap list before g_globalCursor goes out of scope - // (double deletion of the cursor). - wxSetCursor(wxNullCursor); - delete g_globalCursor; - g_globalCursor = NULL; - wxDeleteStockObjects(); + // // Destroy all GDI lists, etc. + // wxDeleteStockLists(); delete wxTheColourDatabase; @@ -332,9 +365,11 @@ void wxApp::CleanUp() delete[] wxBuffer; wxBuffer = NULL; - //// WINDOWS-SPECIFIC CLEANUP + // + // PM-SPECIFIC CLEANUP + // - wxSetKeyboardHook(FALSE); + // wxSetKeyboardHook(FALSE); if (wxSTD_FRAME_ICON) ::WinFreeFileIcon(wxSTD_FRAME_ICON); @@ -358,10 +393,8 @@ void wxApp::CleanUp() if (wxWinHandleList) delete wxWinHandleList; - // GL: I'm annoyed ... I don't know where to put this and I don't want to - // create a module for that as it's part of the core. -#if wxUSE_THREADS delete wxPendingEvents; +#if wxUSE_THREADS delete wxPendingEventsLocker; // If we don't do the following, we get an apparent memory leak. ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); @@ -369,6 +402,10 @@ void wxApp::CleanUp() wxClassInfo::CleanUpClasses(); + // Delete Message queue + if (wxTheApp->m_hMq) + ::WinDestroyMsgQueue(wxTheApp->m_hMq); + delete wxTheApp; wxTheApp = NULL; @@ -390,14 +427,17 @@ void wxApp::CleanUp() // do it as the very last thing because everything else can log messages delete wxLog::SetActiveTarget(NULL); #endif // wxUSE_LOG -} +} // end of wxApp::CleanUp +//---------------------------------------------------------------------- +// Main wxWindows entry point +//---------------------------------------------------------------------- int wxEntry( int argc , char* argv[] ) { - HAB vHab; + HAB vHab = 0; if (!wxApp::Initialize(vHab)) return 0; @@ -407,17 +447,14 @@ int wxEntry( // if (!wxTheApp) { - wxCHECK_MSG( wxApp::GetInitializerFunction() - ,-1 - ,wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") - ); - - wxAppInitializerFunction fnAppIni = wxApp::GetInitializerFunction(); - wxObject* pTest_app = fnAppIni(); - - wxTheApp = (wxApp*)pTest_app; + // The app may have declared a global application object, but we recommend + // the IMPLEMENT_APP macro is used instead, which sets an initializer + // function for delayed, dynamic app object construction. + wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, + wxT("No initializer - use IMPLEMENT_APP macro.") ); + wxTheApp = (*wxApp::GetInitializerFunction()) (); } - wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") ); + wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); wxTheApp->argc = argc; #if wxUSE_UNICODE @@ -449,14 +486,10 @@ int wxEntry( { if (wxTheApp->OnInit()) { - nRetValue = -1; + nRetValue = wxTheApp->OnRun(); } - } - - if (nRetValue == 0) - { + // Normal exit wxWindow* pTopWindow = wxTheApp->GetTopWindow(); - if (pTopWindow) { // Forcibly delete the window. @@ -473,18 +506,42 @@ int wxEntry( } } } + else // app initialization failed + { + wxLogLastError(" Gui initialization failed, exitting"); + } +#if wxUSE_CONSOLEDEBUG + printf("wxTheApp->OnExit "); + fflush(stdout); +#endif wxTheApp->OnExit(); +#if wxUSE_CONSOLEDEBUG + printf("wxApp::CleanUp "); + fflush(stdout); +#endif wxApp::CleanUp(); +#if wxUSE_CONSOLEDEBUG + printf("return %i ", nRetValue); + fflush(stdout); +#endif return(nRetValue); -} +} // end of wxEntry bool wxApp::OnInitGui() { - m_vHab = WinInitialize(0); - m_hMq = WinCreateMsgQueue(m_vHab, 0); + ERRORID vError; + wxString sError; + m_hMq = ::WinCreateMsgQueue(vHabmain, 0); + if (!m_hMq) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogDebug(sError); + return FALSE; + } return TRUE; -} +} // end of wxApp::OnInitGui // // Static member initialization @@ -502,18 +559,24 @@ wxApp::wxApp() m_nPrintMode = wxPRINT_WINDOWS; m_exitOnFrameDelete = TRUE; m_bAuto3D = TRUE; -} + m_hMq = 0; +} // end of wxApp::wxApp wxApp::~wxApp() { + // // Delete command-line args - int i; + // +#if wxUSE_UNICODE + int i; + for (i = 0; i < argc; i++) { delete[] argv[i]; } delete[] argv; -} +#endif +} // end of wxApp::~wxApp bool wxApp::Initialized() { @@ -521,7 +584,7 @@ bool wxApp::Initialized() return TRUE; else return FALSE; -} +} // end of wxApp::Initialized // // Get and process a message, returning FALSE if WM_QUIT @@ -529,7 +592,7 @@ bool wxApp::Initialized() // bool wxApp::DoMessage() { - BOOL bRc = ::WinGetMsg(m_vHab, &m_vMsg, HWND(NULL), 0, 0); + BOOL bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0); if (bRc == 0) { @@ -553,7 +616,7 @@ bool wxApp::DoMessage() static wxMsgArray svSavedMessages; // - // if a secondary thread owns is doing GUI calls, save all messages for + // If a secondary thread owns is doing GUI calls, save all messages for // later processing - we can't process them right now because it will // lead to recursive library calls (and we're not reentrant) // @@ -561,8 +624,10 @@ bool wxApp::DoMessage() { sbHadGuiLock = FALSE; - // leave out WM_COMMAND messages: too dangerous, sometimes + // + // Leave out WM_COMMAND messages: too dangerous, sometimes // the message will be processed twice + // if ( !wxIsWaitingForThread() || svCurrentMsg.msg != WM_COMMAND ) { @@ -573,12 +638,9 @@ bool wxApp::DoMessage() else { // - // have we just regained the GUI lock? if so, post all of the saved + // Have we just regained the GUI lock? if so, post all of the saved // messages // - // FIXME of course, it's not _exactly_ the same as processing the - // messages normally - expect some things to break... - // if (!sbHadGuiLock ) { sbHadGuiLock = TRUE; @@ -591,7 +653,7 @@ bool wxApp::DoMessage() if ( !ProcessMessage((WXMSG *)&vMsg) ) { - ::WinDispatchMsg(m_vHab, &vMsg); + ::WinDispatchMsg(vHabmain, &vMsg); } } svSavedMessages.Empty(); @@ -600,13 +662,13 @@ bool wxApp::DoMessage() #endif // wxUSE_THREADS // Process the message - if (!ProcessMessage((WXMSG *)&svCurrentMsg) ) + if (!ProcessMessage((WXMSG *)&svCurrentMsg)) { - ::WinDispatchMsg(m_vHab, (PQMSG)&svCurrentMsg); + ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg); } } return TRUE; -} +} // end of wxApp::DoMessage ////////////////////////////////////////////////////////////////////////////// // @@ -632,14 +694,14 @@ int wxApp::MainLoop() #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - while (!::WinPeekMsg(m_vHab, &svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && - ProcessIdle() ) + while (/*Pending() &&*/ ProcessIdle()) { +// wxUsleep(10000); } DoMessage(); } return (int)svCurrentMsg.mp1; -} +} // end of wxApp::MainLoop // // Returns TRUE if more time is needed. @@ -651,24 +713,7 @@ bool wxApp::ProcessIdle() vEvent.SetEventObject(this); ProcessEvent(vEvent); return vEvent.MoreRequested(); -} - -#if wxUSE_THREADS -void wxApp::ProcessPendingEvents() -{ - wxNode* pNode = wxPendingEvents->First(); - wxCriticalSectionLocker vLocker(*wxPendingEventsLocker); - - while (pNode) - { - wxEvtHandler* pHandler = (wxEvtHandler *)pNode->Data(); - pHandler->ProcessPendingEvents(); - - delete pNode; - pNode = wxPendingEvents->First(); - } -} -#endif +} // end of wxApp::ProcessIdle void wxApp::ExitMainLoop() { @@ -677,7 +722,7 @@ void wxApp::ExitMainLoop() bool wxApp::Pending() { - return (::WinPeekMsg(m_vHab, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0); + return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0); } void wxApp::Dispatch() @@ -696,13 +741,34 @@ bool wxApp::ProcessMessage( WXMSG* pWxmsg ) { - QMSG* vMsg = (PQMSG)pWxmsg; - HWND hWnd = vMsg->hwnd; + QMSG* pMsg = (PQMSG)pWxmsg; + HWND hWnd = pMsg->hwnd; wxWindow* pWndThis = wxFindWinFromHandle((WXHWND)hWnd); wxWindow* pWnd; +#if wxUSE_TOOLTIPS // - // for some composite controls (like a combobox), wndThis might be NULL + // We must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to + // popup the tooltip bubbles + // + if (pWndThis && (pMsg->msg == WM_MOUSEMOVE)) + { + wxToolTip* pToolTip = pWndThis->GetToolTip(); + if (pToolTip) + { + pToolTip->RelayEvent(pWxmsg); + } + } +#endif // wxUSE_TOOLTIPS + + // + // We must relay Timer events to wxTimer's processing function + // + if (pMsg->msg == WM_TIMER) + wxTimerProc(NULL, 0, (int)pMsg->mp1, 0); + + // + // For some composite controls (like a combobox), wndThis might be NULL // because the subcontrol is not a wxWindow, but only the control itself // is - try to catch this case // @@ -712,14 +778,47 @@ bool wxApp::ProcessMessage( pWndThis = wxFindWinFromHandle((WXHWND)hWnd); } - // Anyone for a non-translation message? Try youngest descendants first. - for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent()) + // + // Try translations first; find the youngest window with + // a translation table. OS/2 has case sensative accels, so + // this block, coded by BK, removes that and helps make them + // case insensative. + // + if(pMsg->msg == WM_CHAR) { - if (pWnd->OS2ProcessMessage(pWxmsg)) - return TRUE; + PBYTE pChmsg = (PBYTE)&(pMsg->msg); + USHORT uSch = CHARMSG(pChmsg)->chr; + bool bRc; + + // + // Do not process keyup events + // + 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); + + + for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() ) + { + if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE) + break; + } + + if(!bRc) // untranslated, should restore original value + CHARMSG(pChmsg)->chr = uSch; + } } + // + // Anyone for a non-translation message? Try youngest descendants first. + // +// for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent()) +// { +// if (pWnd->OS2ProcessMessage(pWxmsg)) +// return TRUE; +// } return FALSE; -} +} // end of wxApp::ProcessMessage void wxApp::OnIdle( wxIdleEvent& rEvent @@ -730,25 +829,33 @@ void wxApp::OnIdle( // // Avoid recursion (via ProcessEvent default case) // - if (sbInOnIdle ) + if (sbInOnIdle) return; sbInOnIdle = TRUE; + // + // If there are pending events, we must process them: pending events + // are either events to the threads other than main or events posted + // with wxPostEvent() functions + // + ProcessPendingEvents(); + // // 'Garbage' collection of windows deleted with Close(). // DeletePendingObjects(); #if wxUSE_LOG - // flush the logged messages if any - wxLog* pLog = wxLog::GetActiveTarget(); - - if (pLog != NULL && pLog->HasPendingMessages()) - pLog->Flush(); + // + // Flush the logged messages if any + // + wxLog::FlushActive(); #endif // wxUSE_LOG + // // Send OnIdle events to all windows + // if (SendIdleEvents()) { // @@ -757,21 +864,8 @@ void wxApp::OnIdle( // rEvent.RequestMore(TRUE); } - - // - // If they are pending events, we must process them. - // -#if wxUSE_THREADS - ProcessPendingEvents(); -#endif sbInOnIdle = FALSE; -} - -void wxWakeUpIdle() -{ - // **** please implement me! **** - // Wake up the idle handler processor, even if it is in another thread... -} +} // end of wxApp::OnIdle // Send idle event to all top-level windows bool wxApp::SendIdleEvents() @@ -788,7 +882,7 @@ bool wxApp::SendIdleEvents() pNode = pNode->GetNext(); } return bNeedMore; -} +} // end of wxApp::SendIdleEvents // // Send idle event to window and all subwindows @@ -817,7 +911,7 @@ bool wxApp::SendIdleEvents( pNode = pNode->Next(); } return bNeedMore; -} +} // end of wxApp::SendIdleEvents void wxApp::DeletePendingObjects() { @@ -838,14 +932,14 @@ void wxApp::DeletePendingObjects() // pNode = wxPendingDelete.First(); } -} +} // end of wxApp::DeletePendingObjects void wxApp::OnEndSession( wxCloseEvent& WXUNUSED(rEvent)) { if (GetTopWindow()) GetTopWindow()->Close(TRUE); -} +} // end of wxApp::OnEndSession // // Default behaviour: close the application with prompts. The @@ -860,32 +954,66 @@ void wxApp::OnQueryEndSession( if (!GetTopWindow()->Close(!rEvent.CanVeto())) rEvent.Veto(TRUE); } -} +} // end of wxApp::OnQueryEndSession void wxExit() { wxLogError(_("Fatal error: exiting")); wxApp::CleanUp(); -} +} // end of wxExit +static bool gs_inYield = FALSE; + +// // Yield to incoming messages +// bool wxYield() { - HAB vHab; + HAB vHab = 0; QMSG vMsg; + + // + // Disable log flushing from here because a call to wxYield() shouldn't + // normally result in message boxes popping up &c + // + wxLog::Suspend(); + + gs_inYield = TRUE; + + // // We want to go back to the main message loop // if we see a WM_QUIT. (?) + // while (::WinPeekMsg(vHab, &vMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && vMsg.msg != WM_QUIT) { +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS if (!wxTheApp->DoMessage()) break; } + // // If they are pending events, we must process them. -#if wxUSE_THREADS - wxTheApp->ProcessPendingEvents(); -#endif + // + if (wxTheApp) + wxTheApp->ProcessPendingEvents(); + + // + // Let the logs be flashed again + // + wxLog::Resume(); + gs_inYield = FALSE; return TRUE; +} // end of wxYield + +// Yield to incoming messages; but fail silently if recursion is detected. +bool wxYieldIfNeeded() +{ + if (gs_inYield) + return FALSE; + + return wxYield(); } wxIcon wxApp::GetStdIcon( @@ -911,15 +1039,43 @@ wxIcon wxApp::GetStdIcon( return wxIcon("wxICON_ERROR"); } return wxIcon("wxICON_ERROR"); -} +} // end of wxApp::GetStdIcon + +//----------------------------------------------------------------------------- +// wxWakeUpIdle +//----------------------------------------------------------------------------- + +void wxWakeUpIdle() +{ + // + // Send the top window a dummy message so idle handler processing will + // start up again. Doing it this way ensures that the idle handler + // wakes up in the right thread (see also wxWakeUpMainThread() which does + // the same for the main app thread only) + // + wxWindow* pTopWindow = wxTheApp->GetTopWindow(); -HINSTANCE wxGetInstance() + if (pTopWindow) + { + if ( !::WinPostMsg(GetHwndOf(pTopWindow), WM_NULL, (MPARAM)0, (MPARAM)0)) + { + // + // Should never happen + // + wxLogLastError("PostMessage(WM_NULL)"); + } + } +} // end of wxWakeUpIdle + +HAB wxGetInstance() { - return wxhInstance; + return vHabmain; } -void wxSetInstance(HINSTANCE hInst) +void wxSetInstance( + HAB vHab +) { - wxhInstance = hInst; + vHabmain = vHab; }