X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc5a847c1b4d89a9e26a3ac7b9e75f41b7530316..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/app.cpp?ds=sidebyside diff --git a/src/os2/app.cpp b/src/os2/app.cpp index 80790f9f67..3620b182ac 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/os2/app.cpp // Purpose: wxApp // Author: David Webster // Modified by: @@ -12,9 +12,11 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/app.h" + #ifndef WX_PRECOMP + #include "wx/dynarray.h" #include "wx/frame.h" - #include "wx/app.h" #include "wx/utils.h" #include "wx/gdicmn.h" #include "wx/pen.h" @@ -26,14 +28,13 @@ #include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/intl.h" - #include "wx/dynarray.h" - #include "wx/wxchar.h" - #include "wx/icon.h" - #include "wx/timer.h" + #include "wx/crt.h" + #include "wx/log.h" + #include "wx/module.h" #endif -#include "wx/log.h" -#include "wx/module.h" +#include "wx/stdpaths.h" +#include "wx/filename.h" #include "wx/os2/private.h" @@ -51,7 +52,11 @@ #endif // -#ifndef __EMX__ +#if defined(__WATCOMC__) + +#include + +#elif !defined(__EMX__) #define select(a,b,c,d,e) bsdselect(a,b,c,d,e) extern "C" int _System bsdselect(int, @@ -63,19 +68,8 @@ extern "C" int _System bsdselect(int, #if wxUSE_THREADS #include "wx/thread.h" - - // define the array of QMSG strutures - WX_DECLARE_OBJARRAY(QMSG, wxMsgArray); - - #include "wx/arrimpl.cpp" - - 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 @@ -87,14 +81,10 @@ extern "C" int _System bsdselect(int, // global variables // --------------------------------------------------------------------------- -extern wxChar* wxBuffer; -extern wxList* wxWinHandleList; -extern wxList WXDLLEXPORT wxPendingDelete; +WXDLLEXPORT_DATA(wxChar*) wxBuffer; extern wxCursor* g_globalCursor; HAB vHabmain = NULLHANDLE; -QMSG svCurrentMsg; -wxApp* wxTheApp = NULL; HICON wxSTD_FRAME_ICON = (HICON) NULL; @@ -125,38 +115,13 @@ struct GsocketCallbackInfo{ void* gsock; }; -// These defines and wrapper functions are used here and in gsockpm.c +// These defines are used here and in gsockpm.cpp #define wxSockReadMask 0x01 #define wxSockWriteMask 0x02 -#ifdef __EMX__ -extern "C" -int wxAppAddSocketHandler(int handle, int mask, - void (*callback)(void*), void * gsock) -{ - return wxTheApp->AddSocketHandler(handle, mask, callback, gsock); -} -extern "C" -void wxAppRemoveSocketHandler(int handle) -{ - wxTheApp->RemoveSocketHandler(handle); -} -#else -// Linkage mode problems using callbacks with extern C in a .cpp module -int wxAppAddSocketHandler(int handle, int mask, - void (*callback)(void*), void * gsock) -{ - return wxTheApp->AddSocketHandler(handle, mask, callback, gsock); -} -void wxAppRemoveSocketHandler(int handle) -{ - wxTheApp->RemoveSocketHandler(handle); -} -#endif - void wxApp::HandleSockets() { - bool pendingEvent = FALSE; + bool pendingEvent = false; // Check whether it's time for Gsocket operation if (m_maxSocketHandles > 0 && m_maxSocketNr > 0) @@ -167,15 +132,13 @@ void wxApp::HandleSockets() int i; struct GsocketCallbackInfo *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo; - int r = 0; timeout.tv_sec = 0; timeout.tv_usec = 0; if ( select(m_maxSocketNr, &readfds, &writefds, 0, &timeout) > 0) { - for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle; i++) + for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle; + (i < m_maxSocketNr - 1) ? i++ : (i = 0)) { - if (i == m_maxSocketNr) - i = 0; if (FD_ISSET(i, &readfds)) { int r; @@ -187,8 +150,7 @@ void wxApp::HandleSockets() if (r < m_maxSocketHandles) { CallbackInfo[r].proc(CallbackInfo[r].gsock); - pendingEvent = TRUE; - wxYield(); + pendingEvent = true; } } if (FD_ISSET(i, &writefds)) @@ -201,15 +163,14 @@ void wxApp::HandleSockets() if (r < m_maxSocketHandles) { CallbackInfo[r].proc(CallbackInfo[r].gsock); - pendingEvent = TRUE; - wxYield(); + pendingEvent = true; } } } m_lastUsedHandle = i; } if (pendingEvent) - wxYield(); + ProcessPendingEvents(); } } // --------------------------------------------------------------------------- @@ -227,10 +188,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 +215,22 @@ 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); + wxFileName GetPrefix(argv[0]); + GetPrefix.MakeAbsolute(); + wxStandardPaths::SetInstallPrefix(GetPrefix.GetPath()); + if (!vHabmain) + { + // TODO: at least give some error message here... + wxAppBase::CleanUp(); - if (!vHab) - return FALSE; - else - vHabmain = vHab; + return false; + } + + wxBuffer = new wxChar[1500]; // FIXME; why? // Some people may wish to use this, but // probably it shouldn't be here by default. @@ -289,7 +238,7 @@ bool wxApp::Initialize( // wxRedirectIOToConsole(); #endif - wxWinHandleList = new wxList(wxKEY_INTEGER); + wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100); // This is to foil optimizations in Visual C++ that throw out dummy.obj. // PLEASE DO NOT ALTER THIS. @@ -300,11 +249,9 @@ bool wxApp::Initialize( // wxSetKeyboardHook(TRUE); - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) - return FALSE; - RegisterWindowClasses(vHab); - return TRUE; + RegisterWindowClasses(vHabmain); + + return true; } // end of wxApp::Initialize const char* CANTREGISTERCLASS = " Can't register Class "; @@ -312,15 +259,13 @@ const char* CANTREGISTERCLASS = " Can't register Class " // RegisterWindowClasses // --------------------------------------------------------------------------- -bool wxApp::RegisterWindowClasses( - HAB vHab -) +bool wxApp::RegisterWindowClasses( HAB vHab ) { - ERRORID vError = 0L; - wxString sError; + ERRORID vError = 0L; + wxString sError; if (!::WinRegisterClass( vHab - ,wxFrameClassName + ,(PSZ)wxFrameClassName ,wxFrameWndProc ,CS_SIZEREDRAW | CS_SYNCPAINT ,sizeof(ULONG) @@ -328,12 +273,12 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } if (!::WinRegisterClass( vHab - ,wxFrameClassNameNoRedraw + ,(PSZ)wxFrameClassNameNoRedraw ,wxWndProc ,0 ,sizeof(ULONG) @@ -341,12 +286,12 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } if (!::WinRegisterClass( vHab - ,wxMDIFrameClassName + ,(PSZ)wxMDIFrameClassName ,wxWndProc ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT ,sizeof(ULONG) @@ -354,12 +299,12 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } if (!::WinRegisterClass( vHab - ,wxMDIFrameClassNameNoRedraw + ,(PSZ)wxMDIFrameClassNameNoRedraw ,wxWndProc ,0 ,sizeof(ULONG) @@ -367,12 +312,12 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } if (!::WinRegisterClass( vHab - ,wxMDIChildFrameClassName + ,(PSZ)wxMDIChildFrameClassName ,wxWndProc ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST ,sizeof(ULONG) @@ -380,12 +325,12 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } if (!::WinRegisterClass( vHab - ,wxMDIChildFrameClassNameNoRedraw + ,(PSZ)wxMDIChildFrameClassNameNoRedraw ,wxWndProc ,CS_HITTEST ,sizeof(ULONG) @@ -393,12 +338,12 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } if (!::WinRegisterClass( vHab - ,wxPanelClassName + ,(PSZ)wxPanelClassName ,wxWndProc ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT ,sizeof(ULONG) @@ -406,12 +351,12 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } if (!::WinRegisterClass( vHab - ,wxCanvasClassName + ,(PSZ)wxCanvasClassName ,wxWndProc ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT ,sizeof(ULONG) @@ -419,60 +364,29 @@ bool wxApp::RegisterWindowClasses( { vError = ::WinGetLastError(vHab); sError = wxPMErrorToStr(vError); - wxLogLastError(sError); - return FALSE; + wxLogLastError(sError.c_str()); + return false; } - return TRUE; + if (!::WinRegisterClass( vHab + ,(PSZ)wxCanvasClassNameNR + ,wxWndProc + ,CS_HITTEST | CS_SYNCPAINT + ,sizeof(ULONG) + )) + { + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError.c_str()); + return false; + } + return true; } // end of wxApp::RegisterWindowClasses // -// Cleans up any wxWindows internal structures left lying around +// Cleans up any wxWidgets internal structures left lying around // 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; @@ -480,7 +394,7 @@ void wxApp::CleanUp() // PM-SPECIFIC CLEANUP // - // wxSetKeyboardHook(FALSE); + // wxSetKeyboardHook(false); if (wxSTD_FRAME_ICON) ::WinFreeFileIcon(wxSTD_FRAME_ICON); @@ -501,150 +415,23 @@ void wxApp::CleanUp() // TODO: ::DeleteObject( wxDisableButtonBrush ); } - if (wxWinHandleList) - delete wxWinHandleList; - - delete wxPendingEvents; -#if wxUSE_THREADS - delete wxPendingEventsLocker; - // If we don't do the following, we get an apparent memory leak. - ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); -#endif - - wxClassInfo::CleanUpClasses(); + delete wxWinHandleHash; + wxWinHandleHash = NULL; // 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; - wxString sError; + ERRORID vError; + wxString sError; if (!wxAppBase::OnInitGui()) - return FALSE; + return false; m_hMq = ::WinCreateMsgQueue(vHabmain, 0); if (!m_hMq) @@ -652,27 +439,17 @@ bool wxApp::OnInitGui() vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); wxLogDebug(sError); - return FALSE; + return false; } - return TRUE; + return true; } // end of wxApp::OnInitGui -// -// Static member initialization -// -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; - wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - argc = 0; argv = NULL; m_nPrintMode = wxPRINT_WINDOWS; - m_exitOnFrameDelete = TRUE; - m_bAuto3D = TRUE; m_hMq = 0; m_maxSocketHandles = 0; m_maxSocketNr = 0; @@ -695,311 +472,17 @@ wxApp::~wxApp() #endif } // end of wxApp::~wxApp -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; -} // end of wxApp::Initialized - -// -// Get and process a message, returning FALSE if WM_QUIT -// received (and also set the flag telling the app to exit the main loop) -// - -bool wxApp::DoMessage() -{ - BOOL bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0); - - if (bRc == 0) - { - // got WM_QUIT - m_bKeepGoing = FALSE; - return FALSE; - } - else if (bRc == -1) - { - // should never happen, but let's test for it nevertheless - wxLogLastError("GetMessage"); - } - else - { -#if wxUSE_THREADS - wxASSERT_MSG( wxThread::IsMain() - ,wxT("only the main thread can process Windows messages") - ); - - static bool sbHadGuiLock = TRUE; - static wxMsgArray svSavedMessages; - - // - // 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) - // - if (!wxGuiOwnedByMainThread()) - { - sbHadGuiLock = FALSE; - - // - // Leave out WM_COMMAND messages: too dangerous, sometimes - // the message will be processed twice - // - if ( !wxIsWaitingForThread() || - svCurrentMsg.msg != WM_COMMAND ) - { - svSavedMessages.Add(svCurrentMsg); - } - return TRUE; - } - else - { - // - // Have we just regained the GUI lock? if so, post all of the saved - // messages - // - if (!sbHadGuiLock ) - { - sbHadGuiLock = TRUE; - - size_t nCount = svSavedMessages.Count(); - - for (size_t n = 0; n < nCount; n++) - { - QMSG vMsg = svSavedMessages[n]; - - if ( !ProcessMessage((WXMSG *)&vMsg) ) - { - ::WinDispatchMsg(vHabmain, &vMsg); - } - } - svSavedMessages.Empty(); - } - } -#endif // wxUSE_THREADS - - // - // Process the message - // - DoMessage((WXMSG *)&svCurrentMsg); - } - return TRUE; -} // end of wxApp::DoMessage - -void wxApp::DoMessage( - WXMSG* pMsg -) -{ - if (!ProcessMessage((WXMSG *)&svCurrentMsg)) - { - ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg); - } -} // end of wxApp::DoMessage - -////////////////////////////////////////////////////////////////////////////// -// -// Keep trying to process messages until WM_QUIT -// received. -// -// If there are messages to be processed, they will all be -// processed and OnIdle will not be called. -// When there are no more messages, OnIdle is called. -// If OnIdle requests more time, -// it will be repeatedly called so long as there are no pending messages. -// A 'feature' of this is that once OnIdle has decided that no more processing -// is required, then it won't get processing time until further messages -// are processed (it'll sit in DoMessage). -// -////////////////////////////////////////////////////////////////////////////// -int wxApp::MainLoop() -{ - m_bKeepGoing = TRUE; - - while (m_bKeepGoing) - { -#if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); -#endif // wxUSE_THREADS - while (!Pending() && ProcessIdle()) - { - HandleSockets(); - wxUsleep(10000); - } - HandleSockets(); - if (Pending()) - DoMessage(); - else - wxUsleep(10000); - - } - return (int)svCurrentMsg.mp1; -} // end of wxApp::MainLoop - -// -// Returns TRUE if more time is needed. -// -bool wxApp::ProcessIdle() -{ - wxIdleEvent vEvent; - - vEvent.SetEventObject(this); - ProcessEvent(vEvent); - return vEvent.MoreRequested(); -} // end of wxApp::ProcessIdle - -void wxApp::ExitMainLoop() -{ - m_bKeepGoing = FALSE; -} - -bool wxApp::Pending() -{ - return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0); -} - -void wxApp::Dispatch() -{ - DoMessage(); -} - -////////////////////////////////////////////////////////////////////////////// -// -// Give all windows a chance to preprocess -// the message. Some may have accelerator tables, or have -// MDI complications. -// -////////////////////////////////////////////////////////////////////////////// -bool wxApp::ProcessMessage( - WXMSG* pWxmsg -) -{ - 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 - - // - // Pass non-system timer messages to the wxTimerProc - // - if (pMsg->msg == WM_TIMER && - (SHORT1FROMMP(pMsg->mp1) != TID_CURSOR && - SHORT1FROMMP(pMsg->mp1) != TID_FLASHWINDOW && - SHORT1FROMMP(pMsg->mp1) != TID_SCROLL && - SHORT1FROMMP(pMsg->mp1) != 0x0000 - )) - wxTimerProc(NULL, 0, (int)pMsg->mp1, 0); - - // - // Allow the window to prevent certain messages from being - // translated/processed (this is currently used by wxTextCtrl to always - // grab Ctrl-C/V/X, even if they are also accelerators in some parent) - // - if (pWndThis && !pWndThis->OS2ShouldPreProcessMessage(pWxmsg)) - { - return FALSE; - } +bool gbInOnIdle = false; - // - // 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 - // - while (hWnd && !pWndThis) - { - hWnd = ::WinQueryWindow(hWnd, QW_PARENT); - pWndThis = wxFindWinFromHandle((WXHWND)hWnd); - } - - // - // 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) - { - 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 -) +void wxApp::OnIdle( wxIdleEvent& rEvent ) { - static bool sbInOnIdle = FALSE; - // // Avoid recursion (via ProcessEvent default case) // - if (sbInOnIdle) + if (gbInOnIdle) 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::FlushActive(); -#endif // wxUSE_LOG + gbInOnIdle = true; #if wxUSE_DC_CACHEING // automated DC cache management: clear the cached DCs and bitmap @@ -1011,122 +494,35 @@ void wxApp::OnIdle( wxDC::ClearCache(); #endif // wxUSE_DC_CACHEING - // - // Send OnIdle events to all windows - // - if (SendIdleEvents()) - { - // - // SendIdleEvents() returns TRUE if at least one window requested more - // idle events - // - rEvent.RequestMore(TRUE); - } - sbInOnIdle = FALSE; + gbInOnIdle = false; } // end of wxApp::OnIdle -// Send idle event to all top-level windows -bool wxApp::SendIdleEvents() -{ - bool bNeedMore = FALSE; - wxWindowList::Node* pNode = wxTopLevelWindows.GetFirst(); - - while (pNode) - { - wxWindow* pWin = pNode->GetData(); - - if (SendIdleEvents(pWin)) - bNeedMore = TRUE; - pNode = pNode->GetNext(); - } - return bNeedMore; -} // end of wxApp::SendIdleEvents - -// -// Send idle event to window and all subwindows -// -bool wxApp::SendIdleEvents( - wxWindow* pWin -) -{ - bool bNeedMore = FALSE; - wxIdleEvent vEvent; - - vEvent.SetEventObject(pWin); - pWin->GetEventHandler()->ProcessEvent(vEvent); - - if (vEvent.MoreRequested()) - bNeedMore = TRUE; - - wxNode* pNode = pWin->GetChildren().First(); - - while (pNode) - { - wxWindow* pWin = (wxWindow*) pNode->Data(); - - if (SendIdleEvents(pWin)) - bNeedMore = TRUE; - pNode = pNode->Next(); - } - 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)) { if (GetTopWindow()) - GetTopWindow()->Close(TRUE); + GetTopWindow()->Close(true); } // end of wxApp::OnEndSession // // Default behaviour: close the application with prompts. The // user can veto the close, and therefore the end session. // -void wxApp::OnQueryEndSession( - wxCloseEvent& rEvent -) +void wxApp::OnQueryEndSession( wxCloseEvent& rEvent ) { if (GetTopWindow()) { if (!GetTopWindow()->Close(!rEvent.CanVeto())) - rEvent.Veto(TRUE); + rEvent.Veto(true); } } // end of wxApp::OnQueryEndSession -void wxExit() -{ - wxLogError(_("Fatal error: exiting")); - - wxApp::CleanUp(); -} // end of wxExit - // // Yield to incoming messages // bool wxApp::Yield(bool onlyIfNeeded) { - static bool s_inYield = FALSE; + static bool s_inYield = false; if ( s_inYield ) { @@ -1135,11 +531,11 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( _T("wxYield() called recursively") ); } - return FALSE; + return false; } - HAB vHab = 0; - QMSG vMsg; + HAB vHab = 0; + QMSG vMsg; // // Disable log flushing from here because a call to wxYield() shouldn't @@ -1147,7 +543,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // wxLog::Suspend(); - s_inYield = TRUE; + s_inYield = true; // // We want to go back to the main message loop @@ -1158,7 +554,7 @@ bool wxApp::Yield(bool onlyIfNeeded) #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - if (!wxTheApp->DoMessage()) + if (!wxTheApp->Dispatch()) break; } // @@ -1167,39 +563,15 @@ bool wxApp::Yield(bool onlyIfNeeded) if (wxTheApp) wxTheApp->ProcessPendingEvents(); + HandleSockets(); // // Let the logs be flashed again // wxLog::Resume(); - s_inYield = FALSE; - return TRUE; + s_inYield = false; + 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 +624,7 @@ void wxApp::RemoveSocketHandler(int handle) // wxWakeUpIdle //----------------------------------------------------------------------------- -void wxWakeUpIdle() +void wxApp::WakeUpIdle() { // // Send the top window a dummy message so idle handler processing will @@ -1269,7 +641,7 @@ void wxWakeUpIdle() // // Should never happen // - wxLogLastError("PostMessage(WM_NULL)"); + wxLogLastError(wxT("PostMessage(WM_NULL)")); } } } // end of wxWakeUpIdle @@ -1279,10 +651,7 @@ HAB wxGetInstance() return vHabmain; } -void wxSetInstance( - HAB vHab -) +void wxSetInstance( HAB vHab ) { vHabmain = vHab; } -