X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc5a847c1b4d89a9e26a3ac7b9e75f41b7530316..5e0d7b6bce53ad3ceb3c832925c25d2e614a0d62:/src/os2/app.cpp diff --git a/src/os2/app.cpp b/src/os2/app.cpp index 80790f9f67..fc5d965009 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ + #pragma implementation "app.h" +#endif + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -72,10 +76,6 @@ extern "C" int _System bsdselect(int, WX_DEFINE_OBJARRAY(wxMsgArray); #endif // wxUSE_THREADS -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif - #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -94,7 +94,6 @@ extern wxCursor* g_globalCursor; HAB vHabmain = NULLHANDLE; QMSG svCurrentMsg; -wxApp* wxTheApp = NULL; HICON wxSTD_FRAME_ICON = (HICON) NULL; @@ -227,10 +226,11 @@ void wxApp::HandleSockets() // // Initialize // -bool wxApp::Initialize( - HAB vHab -) +bool wxApp::Initialize(int& argc, wxChar **argv) { + if ( !wxAppBase::Initialize(argc, argv) ) + return false; + #if defined(wxUSE_CONSOLEDEBUG) #if wxUSE_CONSOLEDEBUG /***********************************************/ @@ -253,35 +253,20 @@ bool wxApp::Initialize( #endif //wxUSE_CONSOLEDEBUG #endif - wxBuffer = new wxChar[1500]; // FIXME; why? - - wxClassInfo::InitializeClasses(); - -#if wxUSE_THREADS - wxPendingEventsLocker = new wxCriticalSection; -#endif - - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); - - wxInitializeStockLists(); - wxInitializeStockObjects(); - -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif - - wxBitmap::InitStandardHandlers(); - // // OS2 has to have an anchorblock // - vHab = WinInitialize(0); + vHabmain = WinInitialize(0); + + if (!vHabmain) + { + // TODO: at least give some error message here... + wxAppBase::CleanUp(); - if (!vHab) return FALSE; - else - vHabmain = vHab; + } + + wxBuffer = new wxChar[1500]; // FIXME; why? // Some people may wish to use this, but // probably it shouldn't be here by default. @@ -300,10 +285,8 @@ bool wxApp::Initialize( // wxSetKeyboardHook(TRUE); - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) - return FALSE; RegisterWindowClasses(vHab); + return TRUE; } // end of wxApp::Initialize @@ -422,6 +405,18 @@ bool wxApp::RegisterWindowClasses( wxLogLastError(sError); return FALSE; } + if (!::WinRegisterClass( vHab + ,wxCanvasClassNameNR + ,wxWndProc + ,CS_HITTEST | CS_SYNCPAINT + ,sizeof(ULONG) + )) + { + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); + return FALSE; + } return TRUE; } // end of wxApp::RegisterWindowClasses @@ -430,49 +425,6 @@ bool wxApp::RegisterWindowClasses( // void wxApp::CleanUp() { - // - // COMMON CLEANUP - // - -#if wxUSE_LOG - - // - // 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 - // - 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(); -#endif - - wxDeleteStockObjects(); - - // - // Destroy all GDI lists, etc. - // - wxDeleteStockLists(); - - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; - - wxBitmap::CleanUpHandlers(); - delete[] wxBuffer; wxBuffer = NULL; @@ -511,133 +463,13 @@ void wxApp::CleanUp() ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); #endif - wxClassInfo::CleanUpClasses(); - // Delete Message queue if (wxTheApp->m_hMq) ::WinDestroyMsgQueue(wxTheApp->m_hMq); - delete wxTheApp; - wxTheApp = NULL; - -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft(TRUE) > 0) - { - wxLogDebug(wxT("There were memory leaks.")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - // wxDebugContext::SetStream(NULL, NULL); -#endif - -#if wxUSE_LOG - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG + wxAppBase::CleanUp(); } // end of wxApp::CleanUp -//---------------------------------------------------------------------- -// Main wxWindows entry point -//---------------------------------------------------------------------- -int wxEntry( - int argc -, char* argv[] -) -{ - HAB vHab = 0; - - if (!wxApp::Initialize(vHab)) - return 0; - - // - // create the application object or ensure that one already exists - // - if (!wxTheApp) - { - // 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, 0, wxT("You have to define an instance of wxApp!") ); - wxTheApp->argc = argc; - -#if wxUSE_UNICODE - wxTheApp->argv = new wxChar*[argc+1]; - - int nArgc = 0; - - while (nArgc < argc) - { - wxTheApp->argv[nArgc] = wxStrdup(wxConvLibc.cMB2WX(argv[nArgc])); - nArgc++; - } - wxTheApp->argv[nArgc] = (wxChar *)NULL; -#else - wxTheApp->argv = argv; -#endif - - wxString sName(wxFileNameFromPath(argv[0])); - - wxStripExtension(sName); - wxTheApp->SetAppName(sName); - - int nRetValue = 0; - - if (!wxTheApp->OnInitGui()) - nRetValue = -1; - - if (nRetValue == 0) - { - if (wxTheApp->OnInit()) - { - nRetValue = wxTheApp->OnRun(); - } - // Normal exit - wxWindow* pTopWindow = wxTheApp->GetTopWindow(); - if (pTopWindow) - { - // Forcibly delete the window. - if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) || - pTopWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - pTopWindow->Close(TRUE); - wxTheApp->DeletePendingObjects(); - } - else - { - delete pTopWindow; - wxTheApp->SetTopWindow(NULL); - } - } - } - 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() { ERRORID vError; @@ -658,11 +490,6 @@ bool wxApp::OnInitGui() return TRUE; } // end of wxApp::OnInitGui -// -// Static member initialization -// -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; - wxApp::wxApp() { m_topWindow = NULL; @@ -671,7 +498,6 @@ wxApp::wxApp() argc = 0; argv = NULL; m_nPrintMode = wxPRINT_WINDOWS; - m_exitOnFrameDelete = TRUE; m_bAuto3D = TRUE; m_hMq = 0; m_maxSocketHandles = 0; @@ -769,10 +595,7 @@ bool wxApp::DoMessage() { QMSG vMsg = svSavedMessages[n]; - if ( !ProcessMessage((WXMSG *)&vMsg) ) - { - ::WinDispatchMsg(vHabmain, &vMsg); - } + DoMessage((WXMSG*)&vMsg); } svSavedMessages.Empty(); } @@ -850,13 +673,13 @@ bool wxApp::ProcessIdle() void wxApp::ExitMainLoop() { - m_bKeepGoing = FALSE; -} + ::WinPostMsg(NULL, WM_QUIT, 0, 0); +} // end of wxApp::ExitMainLoop bool wxApp::Pending() { return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0); -} +} // end of wxApp::Pending void wxApp::Dispatch() { @@ -879,21 +702,6 @@ bool wxApp::ProcessMessage( 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 - // // Pass non-system timer messages to the wxTimerProc // @@ -968,19 +776,20 @@ bool wxApp::ProcessMessage( return FALSE; } // end of wxApp::ProcessMessage +bool gbInOnIdle = FALSE; + void wxApp::OnIdle( wxIdleEvent& rEvent ) { - static bool sbInOnIdle = FALSE; // // Avoid recursion (via ProcessEvent default case) // - if (sbInOnIdle) + if (gbInOnIdle) return; - sbInOnIdle = TRUE; + gbInOnIdle = TRUE; // // If there are pending events, we must process them: pending events @@ -1022,7 +831,7 @@ void wxApp::OnIdle( // rEvent.RequestMore(TRUE); } - sbInOnIdle = FALSE; + gbInOnIdle = FALSE; } // end of wxApp::OnIdle // Send idle event to all top-level windows @@ -1071,27 +880,6 @@ bool wxApp::SendIdleEvents( return bNeedMore; } // end of wxApp::SendIdleEvents -void wxApp::DeletePendingObjects() -{ - wxNode* pNode = wxPendingDelete.First(); - - while (pNode) - { - wxObject* pObj = (wxObject *)pNode->Data(); - - delete pObj; - - if (wxPendingDelete.Member(pObj)) - delete pNode; - - // - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - // - pNode = wxPendingDelete.First(); - } -} // end of wxApp::DeletePendingObjects - void wxApp::OnEndSession( wxCloseEvent& WXUNUSED(rEvent)) { @@ -1114,11 +902,12 @@ void wxApp::OnQueryEndSession( } } // end of wxApp::OnQueryEndSession -void wxExit() +void wxApp::Exit() { - wxLogError(_("Fatal error: exiting")); - wxApp::CleanUp(); + + // VZ: must really exit somehow, insert appropriate OS/2 syscall (FIXME) + wxAppConsole::Exit(); } // end of wxExit // @@ -1175,31 +964,6 @@ bool wxApp::Yield(bool onlyIfNeeded) return TRUE; } // end of wxYield -wxIcon wxApp::GetStdIcon( - int nWhich -) const -{ - switch(nWhich) - { - case wxICON_INFORMATION: - return wxIcon("wxICON_INFO"); - - case wxICON_QUESTION: - return wxIcon("wxICON_QUESTION"); - - case wxICON_EXCLAMATION: - return wxIcon("wxICON_WARNING"); - - default: - wxFAIL_MSG(wxT("requested non existent standard icon")); - // still fall through - - case wxICON_HAND: - return wxIcon("wxICON_ERROR"); - } - return wxIcon("wxICON_ERROR"); -} // end of wxApp::GetStdIcon - int wxApp::AddSocketHandler(int handle, int mask, void (*callback)(void*), void * gsock) { @@ -1252,7 +1016,7 @@ void wxApp::RemoveSocketHandler(int handle) // wxWakeUpIdle //----------------------------------------------------------------------------- -void wxWakeUpIdle() +void wxApp::WakeUpIdle() { // // Send the top window a dummy message so idle handler processing will