X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f23208caccf81b0b34c5c11b466c6bd64fdf0f9d..80d2803f703d1b238f42725504f08266ef02defe:/src/os2/app.cpp diff --git a/src/os2/app.cpp b/src/os2/app.cpp index 2f333e5b1b..ef18d55511 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -51,6 +51,10 @@ #include "wx/resource.h" #endif +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif // wxUSE_TOOLTIPS + #include #include @@ -59,17 +63,13 @@ // --------------------------------------------------------------------------- extern wxChar* wxBuffer; -extern wxChar* wxOsVersion; extern wxList* wxWinHandleList; extern wxList WXDLLEXPORT wxPendingDelete; extern wxCursor* g_globalCursor; -HINSTANCE wxhInstance = 0; +HAB vHabmain = NULLHANDLE; QMSG svCurrentMsg; wxApp* wxTheApp = NULL; -HAB vHabmain = 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 @@ -92,12 +92,6 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; HBRUSH wxDisableButtonBrush = (HBRUSH) 0; -MRESULT EXPENTRY wxWndProc( HWND - ,ULONG - ,MPARAM - ,MPARAM - ); - // =========================================================================== // implementation // =========================================================================== @@ -114,7 +108,9 @@ MRESULT EXPENTRY wxWndProc( HWND EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -//// Initialize +// +// Initialize +// bool wxApp::Initialize( HAB vHab ) @@ -139,12 +135,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(); @@ -157,17 +151,6 @@ 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); @@ -184,15 +167,12 @@ bool wxApp::Initialize( if (!wxModule::InitializeModules()) return FALSE; return TRUE; -} +} // end of wxApp::Initialize // --------------------------------------------------------------------------- // 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 ) @@ -204,8 +184,8 @@ bool wxApp::RegisterWindowClasses( if (!::WinRegisterClass( vHab ,wxFrameClassName ,(PFNWP)wxWndProc - ,CS_SIZEREDRAW | CS_SYNCPAINT - ,0 + ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT | CS_FRAME + ,sizeof(ULONG) )) { vError = ::WinGetLastError(vHab); @@ -230,7 +210,7 @@ bool wxApp::RegisterWindowClasses( if (!::WinRegisterClass( vHab ,wxMDIFrameClassName ,(PFNWP)wxWndProc - ,CS_SIZEREDRAW | CS_SYNCPAINT + ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT ,0 )) { @@ -305,46 +285,49 @@ bool wxApp::RegisterWindowClasses( 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; @@ -355,7 +338,9 @@ void wxApp::CleanUp() delete[] wxBuffer; wxBuffer = NULL; - //// WINDOWS-SPECIFIC CLEANUP + // + // PM-SPECIFIC CLEANUP + // // wxSetKeyboardHook(FALSE); @@ -381,10 +366,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(); @@ -392,6 +375,10 @@ void wxApp::CleanUp() wxClassInfo::CleanUpClasses(); + // Delete Message queue + if (wxTheApp->m_hMq) + ::WinDestroyMsgQueue(wxTheApp->m_hMq); + delete wxTheApp; wxTheApp = NULL; @@ -413,7 +400,7 @@ 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 int wxEntry( int argc @@ -430,17 +417,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 @@ -472,34 +456,32 @@ int wxEntry( { if (wxTheApp->OnInit()) { - nRetValue = -1; + nRetValue = wxTheApp->OnRun(); +// nRetValue = -1; } } - if (nRetValue == 0) - { - wxWindow* pTopWindow = wxTheApp->GetTopWindow(); + wxWindow* pTopWindow = wxTheApp->GetTopWindow(); - if (pTopWindow) + if (pTopWindow) + { + // Forcibly delete the window. + if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) || + pTopWindow->IsKindOf(CLASSINFO(wxDialog)) ) { - // Forcibly delete the window. - if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) || - pTopWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - pTopWindow->Close(TRUE); - wxTheApp->DeletePendingObjects(); - } - else - { - delete pTopWindow; - wxTheApp->SetTopWindow(NULL); - } + pTopWindow->Close(TRUE); + wxTheApp->DeletePendingObjects(); + } + else + { + delete pTopWindow; + wxTheApp->SetTopWindow(NULL); } } wxTheApp->OnExit(); wxApp::CleanUp(); return(nRetValue); -} +} // end of wxEntry bool wxApp::OnInitGui() { @@ -515,7 +497,7 @@ bool wxApp::OnInitGui() return FALSE; } return TRUE; -} +} // end of wxApp::OnInitGui // // Static member initialization @@ -533,20 +515,24 @@ wxApp::wxApp() m_nPrintMode = wxPRINT_WINDOWS; m_exitOnFrameDelete = TRUE; m_bAuto3D = TRUE; -} + m_hMq = 0; +} // end of wxApp::wxApp wxApp::~wxApp() { -#if wxUSE_UNICODE + // // 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() { @@ -554,7 +540,7 @@ bool wxApp::Initialized() return TRUE; else return FALSE; -} +} // end of wxApp::Initialized // // Get and process a message, returning FALSE if WM_QUIT @@ -562,8 +548,9 @@ bool wxApp::Initialized() // bool wxApp::DoMessage() { - BOOL bRc = ::WinGetMsg(vHabmain, &m_vMsg, HWND(NULL), 0, 0); + BOOL bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0); +// wxUsleep(1000); if (bRc == 0) { // got WM_QUIT @@ -586,7 +573,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) // @@ -594,8 +581,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 ) { @@ -606,12 +595,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; @@ -633,13 +619,13 @@ bool wxApp::DoMessage() #endif // wxUSE_THREADS // Process the message - if (!ProcessMessage((WXMSG *)&svCurrentMsg) ) + if (!ProcessMessage((WXMSG *)&svCurrentMsg)) { ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg); } } return TRUE; -} +} // end of wxApp::DoMessage ////////////////////////////////////////////////////////////////////////////// // @@ -665,14 +651,14 @@ int wxApp::MainLoop() #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - while (!::WinPeekMsg(vHabmain, &svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && - ProcessIdle() ) - { - } - DoMessage(); + while (!Pending() && ProcessIdle()) + { +// wxUsleep(10000); + } + DoMessage(); } return (int)svCurrentMsg.mp1; -} +} // end of wxApp::MainLoop // // Returns TRUE if more time is needed. @@ -684,24 +670,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() { @@ -729,13 +698,28 @@ 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 + // + // 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 + // - // for some composite controls (like a combobox), wndThis might be NULL + // 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 // @@ -745,14 +729,45 @@ 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 @@ -768,20 +783,28 @@ void wxApp::OnIdle( 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()) { // @@ -790,21 +813,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() @@ -821,7 +831,7 @@ bool wxApp::SendIdleEvents() pNode = pNode->GetNext(); } return bNeedMore; -} +} // end of wxApp::SendIdleEvents // // Send idle event to window and all subwindows @@ -850,7 +860,7 @@ bool wxApp::SendIdleEvents( pNode = pNode->Next(); } return bNeedMore; -} +} // end of wxApp::SendIdleEvents void wxApp::DeletePendingObjects() { @@ -871,14 +881,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 @@ -893,33 +903,53 @@ 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 +// // Yield to incoming messages +// bool wxYield() { 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(); + + // // 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(); return TRUE; -} +} // end of wxYield wxIcon wxApp::GetStdIcon( int nWhich @@ -944,15 +974,43 @@ wxIcon wxApp::GetStdIcon( return wxIcon("wxICON_ERROR"); } return wxIcon("wxICON_ERROR"); -} +} // end of wxApp::GetStdIcon + +//----------------------------------------------------------------------------- +// wxWakeUpIdle +//----------------------------------------------------------------------------- -HINSTANCE wxGetInstance() +void wxWakeUpIdle() { - return wxhInstance; + // + // 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(); + + 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 vHabmain; } -void wxSetInstance(HINSTANCE hInst) +void wxSetInstance( + HAB vHab +) { - wxhInstance = hInst; + vHabmain = vHab; }