X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/025f7d775c8366dec72258e0d9d83848203c4871..8a31648287be0ef976f133de2786b137f1e98340:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 2d46ea6145..8df236020f 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -50,6 +50,8 @@ #include "wx/dynlib.h" #include "wx/evtloop.h" #include "wx/thread.h" +#include "wx/scopeguard.h" +#include "wx/vector.h" #include "wx/msw/private.h" #include "wx/msw/dc.h" @@ -103,6 +105,9 @@ typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *); #endif // defined(DLLVERSIONINFO) +#ifndef ATTACH_PARENT_PROCESS + #define ATTACH_PARENT_PROCESS ((DWORD)-1) +#endif // --------------------------------------------------------------------------- // global variables @@ -112,19 +117,27 @@ extern void wxSetKeyboardHook(bool doIt); #endif -// NB: all "NoRedraw" classes must have the same names as the "normal" classes -// with NR suffix - wxWindow::MSWCreate() supposes this -#ifdef __WXWINCE__ -WXDLLIMPEXP_CORE wxChar *wxCanvasClassName; -WXDLLIMPEXP_CORE wxChar *wxCanvasClassNameNR; -#else -WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName = wxT("wxWindowClass"); -WXDLLIMPEXP_CORE const wxChar *wxCanvasClassNameNR = wxT("wxWindowClassNR"); -#endif -WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass"); -WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); -WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); -WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); +// because of mingw32 4.3 bug this struct can't be inside the namespace below: +// see http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/110282 +struct ClassRegInfo +{ + ClassRegInfo(const wxChar *name) + : regname(name), + regnameNR(regname + wxApp::GetNoRedrawClassSuffix()) + { + } + + // the name of the registered class with and without CS_[HV]REDRAW styles + wxString regname; + wxString regnameNR; +}; + +namespace +{ + +wxVector gs_regClassesInfo; + +} // anonymous namespace // ---------------------------------------------------------------------------- // private functions @@ -189,11 +202,6 @@ void *wxGUIAppTraits::BeforeChildWaitLoop() return new ChildWaitLoopData(wd, winActive); } -void wxGUIAppTraits::AlwaysYield() -{ - wxYield(); -} - void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig) { wxEndBusyCursor(); @@ -211,6 +219,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig) delete data; } +#if wxUSE_THREADS bool wxGUIAppTraits::DoMessageFromThreadWait() { // we should return false only if the app should exit, i.e. only if @@ -225,14 +234,20 @@ bool wxGUIAppTraits::DoMessageFromThreadWait() return evtLoop->Dispatch(); } -DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread) +DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags) { - // if we don't have a running event loop, we shouldn't wait for the - // messages as we never remove them from the message queue and so we enter - // an infinite loop as MsgWaitForMultipleObjects() keeps returning - // WAIT_OBJECT_0 + 1 - if ( !wxEventLoop::GetActive() ) + // We only ever dispatch messages from the main thread and, additionally, + // even from the main thread we shouldn't wait for the message if we don't + // have a running event loop as we would never remove them from the message + // queue then and so we would enter an infinite loop as + // MsgWaitForMultipleObjects() keeps returning WAIT_OBJECT_0 + 1. + if ( flags == wxTHREAD_WAIT_BLOCK || + !wxIsMainThread() || + !wxEventLoop::GetActive() ) + { + // Simple blocking wait. return DoSimpleWaitForThread(hThread); + } return ::MsgWaitForMultipleObjects ( @@ -244,6 +259,7 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread) QS_ALLPOSTMESSAGE ); } +#endif // wxUSE_THREADS wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const { @@ -282,6 +298,306 @@ wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() return new wxEventLoop; } +// --------------------------------------------------------------------------- +// Stuff for using console from the GUI applications +// --------------------------------------------------------------------------- + +#ifndef __WXWINCE__ + +#if wxUSE_DYNLIB_CLASS + +#include + +namespace +{ + +/* + Helper class to manipulate console from a GUI app. + + Notice that console output is available in the GUI app only if: + - AttachConsole() returns TRUE (which means it never works under pre-XP) + - we have a valid STD_ERROR_HANDLE + - command history hasn't been changed since our startup + + To check if all these conditions are verified, you need to simple call + IsOkToUse(). It will check the first two conditions above the first time it + is called (and if this fails, the subsequent calls will return immediately) + and also recheck the last one every time it is called. + */ +class wxConsoleStderr +{ +public: + // default ctor does nothing, call Init() before using this class + wxConsoleStderr() + { + m_hStderr = INVALID_HANDLE_VALUE; + m_historyLen = + m_dataLen = + m_dataLine = 0; + + m_ok = -1; + } + + ~wxConsoleStderr() + { + if ( m_hStderr != INVALID_HANDLE_VALUE ) + { + if ( !::FreeConsole() ) + { + wxLogLastError(wxT("FreeConsole")); + } + } + } + + // return true if we were successfully initialized and there had been no + // console activity which would interfere with our output since then + bool IsOkToUse() const + { + if ( m_ok == -1 ) + { + wxConsoleStderr * const self = const_cast(this); + self->m_ok = self->DoInit(); + + // no need to call IsHistoryUnchanged() as we just initialized + // m_history anyhow + return m_ok == 1; + } + + return m_ok && IsHistoryUnchanged(); + } + + + // output the provided text on the console, return true if ok + bool Write(const wxString& text); + +private: + // called by Init() once only to do the real initialization + bool DoInit(); + + // retrieve the command line history into the provided buffer and return + // its length + int GetCommandHistory(wxWxCharBuffer& buf) const; + + // check if the console history has changed + bool IsHistoryUnchanged() const; + + int m_ok; // initially -1, set to true or false by Init() + + wxDynamicLibrary m_dllKernel32; + + HANDLE m_hStderr; // console handle, if it's valid we must call + // FreeConsole() (even if m_ok != 1) + + wxWxCharBuffer m_history; // command history on startup + int m_historyLen; // length command history buffer + + wxCharBuffer m_data; // data between empty line and cursor position + int m_dataLen; // length data buffer + int m_dataLine; // line offset + + typedef DWORD (WINAPI *GetConsoleCommandHistory_t)(LPTSTR sCommands, + DWORD nBufferLength, + LPCTSTR sExeName); + typedef DWORD (WINAPI *GetConsoleCommandHistoryLength_t)(LPCTSTR sExeName); + + GetConsoleCommandHistory_t m_pfnGetConsoleCommandHistory; + GetConsoleCommandHistoryLength_t m_pfnGetConsoleCommandHistoryLength; + + wxDECLARE_NO_COPY_CLASS(wxConsoleStderr); +}; + +bool wxConsoleStderr::DoInit() +{ + HANDLE hStderr = ::GetStdHandle(STD_ERROR_HANDLE); + + if ( hStderr == INVALID_HANDLE_VALUE || !hStderr ) + return false; + + if ( !m_dllKernel32.Load(wxT("kernel32.dll")) ) + return false; + + typedef BOOL (WINAPI *AttachConsole_t)(DWORD dwProcessId); + AttachConsole_t wxDL_INIT_FUNC(pfn, AttachConsole, m_dllKernel32); + + if ( !pfnAttachConsole || !pfnAttachConsole(ATTACH_PARENT_PROCESS) ) + return false; + + // console attached, set m_hStderr now to ensure that we free it in the + // dtor + m_hStderr = hStderr; + + wxDL_INIT_FUNC_AW(m_pfn, GetConsoleCommandHistory, m_dllKernel32); + if ( !m_pfnGetConsoleCommandHistory ) + return false; + + wxDL_INIT_FUNC_AW(m_pfn, GetConsoleCommandHistoryLength, m_dllKernel32); + if ( !m_pfnGetConsoleCommandHistoryLength ) + return false; + + // remember the current command history to be able to compare with it later + // in IsHistoryUnchanged() + m_historyLen = GetCommandHistory(m_history); + if ( !m_history ) + return false; + + + // now find the first blank line above the current position + CONSOLE_SCREEN_BUFFER_INFO csbi; + + if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) ) + { + wxLogLastError(wxT("GetConsoleScreenBufferInfo")); + return false; + } + + COORD pos; + pos.X = 0; + pos.Y = csbi.dwCursorPosition.Y + 1; + + // we decide that a line is empty if first 4 characters are spaces + DWORD ret; + char buf[4]; + do + { + pos.Y--; + if ( !::ReadConsoleOutputCharacterA(m_hStderr, buf, WXSIZEOF(buf), + pos, &ret) ) + { + wxLogLastError(wxT("ReadConsoleOutputCharacterA")); + return false; + } + } while ( wxStrncmp(" ", buf, WXSIZEOF(buf)) != 0 ); + + // calculate line offset and length of data + m_dataLine = csbi.dwCursorPosition.Y - pos.Y; + m_dataLen = m_dataLine*csbi.dwMaximumWindowSize.X + csbi.dwCursorPosition.X; + + if ( m_dataLen > 0 ) + { + m_data.extend(m_dataLen); + if ( !::ReadConsoleOutputCharacterA(m_hStderr, m_data.data(), m_dataLen, + pos, &ret) ) + { + wxLogLastError(wxT("ReadConsoleOutputCharacterA")); + return false; + } + } + + return true; +} + +int wxConsoleStderr::GetCommandHistory(wxWxCharBuffer& buf) const +{ + // these functions are internal and may only be called by cmd.exe + static const wxChar *CMD_EXE = wxT("cmd.exe"); + + const int len = m_pfnGetConsoleCommandHistoryLength(CMD_EXE); + if ( len ) + { + buf.extend(len); + + int len2 = m_pfnGetConsoleCommandHistory(buf.data(), len, CMD_EXE); + +#if !wxUSE_UNICODE + // there seems to be a bug in the GetConsoleCommandHistoryA(), it + // returns the length of Unicode string and not ANSI one + len2 /= 2; +#endif // !wxUSE_UNICODE + + if ( len2 != len ) + { + wxFAIL_MSG( wxT("failed getting history?") ); + } + } + + return len; +} + +bool wxConsoleStderr::IsHistoryUnchanged() const +{ + wxASSERT_MSG( m_ok == 1, wxT("shouldn't be called if not initialized") ); + + // get (possibly changed) command history + wxWxCharBuffer history; + const int historyLen = GetCommandHistory(history); + + // and compare it with the original one + return historyLen == m_historyLen && history && + memcmp(m_history, history, historyLen) == 0; +} + +bool wxConsoleStderr::Write(const wxString& text) +{ + wxASSERT_MSG( m_hStderr != INVALID_HANDLE_VALUE, + wxT("should only be called if Init() returned true") ); + + // get current position + CONSOLE_SCREEN_BUFFER_INFO csbi; + if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) ) + { + wxLogLastError(wxT("GetConsoleScreenBufferInfo")); + return false; + } + + // and calculate new position (where is empty line) + csbi.dwCursorPosition.X = 0; + csbi.dwCursorPosition.Y -= m_dataLine; + + if ( !::SetConsoleCursorPosition(m_hStderr, csbi.dwCursorPosition) ) + { + wxLogLastError(wxT("SetConsoleCursorPosition")); + return false; + } + + DWORD ret; + if ( !::FillConsoleOutputCharacter(m_hStderr, wxT(' '), m_dataLen, + csbi.dwCursorPosition, &ret) ) + { + wxLogLastError(wxT("FillConsoleOutputCharacter")); + return false; + } + + if ( !::WriteConsole(m_hStderr, text.wx_str(), text.length(), &ret, NULL) ) + { + wxLogLastError(wxT("WriteConsole")); + return false; + } + + WriteConsoleA(m_hStderr, m_data, m_dataLen, &ret, 0); + + return true; +} + +wxConsoleStderr s_consoleStderr; + +} // anonymous namespace + +bool wxGUIAppTraits::CanUseStderr() +{ + return s_consoleStderr.IsOkToUse(); +} + +bool wxGUIAppTraits::WriteToStderr(const wxString& text) +{ + return s_consoleStderr.IsOkToUse() && s_consoleStderr.Write(text); +} + +#else // !wxUSE_DYNLIB_CLASS + +bool wxGUIAppTraits::CanUseStderr() +{ + return false; +} + +bool wxGUIAppTraits::WriteToStderr(const wxString& WXUNUSED(text)) +{ + return false; +} + +#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS + +#endif // !__WXWINCE__ + // =========================================================================== // wxApp implementation // =========================================================================== @@ -323,20 +639,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // ensure that base cleanup is done if we return too early wxCallBaseCleanup callBaseCleanup(this); -#ifdef __WXWINCE__ - wxString tmp = GetAppName(); - tmp += wxT("ClassName"); - wxCanvasClassName = wxStrdup( tmp.wc_str() ); - tmp += wxT("NR"); - wxCanvasClassNameNR = wxStrdup( tmp.wc_str() ); - HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL ); - if (hWnd) - { - SetForegroundWindow( (HWND)(((DWORD)hWnd)|0x01) ); - return false; - } -#endif - #if !defined(__WXMICROWIN__) InitCommonControls(); #endif // !defined(__WXMICROWIN__) @@ -353,10 +655,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxOleInitialize(); - RegisterWindowClasses(); - - wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100); - #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) wxSetKeyboardHook(true); #endif @@ -367,153 +665,101 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } // --------------------------------------------------------------------------- -// RegisterWindowClasses +// Win32 window class registration // --------------------------------------------------------------------------- -// 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() +/* static */ +const wxChar *wxApp::GetRegisteredClassName(const wxChar *name, + int bgBrushCol, + int extraStyles) { - WNDCLASS wndclass; - wxZeroMemory(wndclass); - - // for each class we register one with CS_(V|H)REDRAW style and one - // without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag - static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; - static const long styleNoRedraw = CS_DBLCLKS; - - // the fields which are common to all classes - wndclass.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass.hInstance = wxhInstance; - wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW); - - // register the class for all normal windows - wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); - wndclass.lpszClassName = wxCanvasClassName; - wndclass.style = styleNormal; - - if ( !RegisterClass(&wndclass) ) - { - wxLogLastError(wxT("RegisterClass(frame)")); - } - - // "no redraw" frame - wndclass.lpszClassName = wxCanvasClassNameNR; - wndclass.style = styleNoRedraw; - - if ( !RegisterClass(&wndclass) ) + const size_t count = gs_regClassesInfo.size(); + for ( size_t n = 0; n < count; n++ ) { - wxLogLastError(wxT("RegisterClass(no redraw frame)")); + if ( gs_regClassesInfo[n].regname == name ) + return gs_regClassesInfo[n].regname.c_str(); } - // Register the MDI frame window class. - wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves - wndclass.lpszClassName = wxMDIFrameClassName; - wndclass.style = styleNormal; + // we need to register this class + WNDCLASS wndclass; + wxZeroMemory(wndclass); - if ( !RegisterClass(&wndclass) ) - { - wxLogLastError(wxT("RegisterClass(MDI parent)")); - } + wndclass.lpfnWndProc = (WNDPROC)wxWndProc; + wndclass.hInstance = wxGetInstance(); + wndclass.hCursor = ::LoadCursor(NULL, IDC_ARROW); + wndclass.hbrBackground = (HBRUSH)wxUIntToPtr(bgBrushCol + 1); + wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | extraStyles; - // "no redraw" MDI frame - wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw; - wndclass.style = styleNoRedraw; - if ( !RegisterClass(&wndclass) ) + ClassRegInfo regClass(name); + wndclass.lpszClassName = regClass.regname.wx_str(); + if ( !::RegisterClass(&wndclass) ) { - wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)")); + wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"), + regClass.regname)); + return NULL; } - // Register the MDI child frame window class. - wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wndclass.lpszClassName = wxMDIChildFrameClassName; - wndclass.style = styleNormal; - - if ( !RegisterClass(&wndclass) ) + wndclass.style &= ~(CS_HREDRAW | CS_VREDRAW); + wndclass.lpszClassName = regClass.regnameNR.wx_str(); + if ( !::RegisterClass(&wndclass) ) { - wxLogLastError(wxT("RegisterClass(MDI child)")); + wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"), + regClass.regname)); + ::UnregisterClass(regClass.regname.c_str(), wxGetInstance()); + return NULL; } - // "no redraw" MDI child frame - wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw; - wndclass.style = styleNoRedraw; - - if ( !RegisterClass(&wndclass) ) - { - wxLogLastError(wxT("RegisterClass(no redraw MDI child)")); - } + gs_regClassesInfo.push_back(regClass); - return true; + // take care to return the pointer which will remain valid after the + // function returns (it could be invalidated later if new elements are + // added to the vector and it's reallocated but this shouldn't matter as + // this pointer should be used right now, not stored) + return gs_regClassesInfo.back().regname.wx_str(); } -// --------------------------------------------------------------------------- -// UnregisterWindowClasses -// --------------------------------------------------------------------------- - -bool wxApp::UnregisterWindowClasses() +bool wxApp::IsRegisteredClassName(const wxString& name) { - bool retval = true; - -#ifndef __WXMICROWIN__ - // MDI frame window class. - if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) ) + const size_t count = gs_regClassesInfo.size(); + for ( size_t n = 0; n < count; n++ ) { - wxLogLastError(wxT("UnregisterClass(MDI parent)")); - - retval = false; - } - - // "no redraw" MDI frame - if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) ) - { - wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)")); - - retval = false; - } - - // MDI child frame window class. - if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) ) - { - wxLogLastError(wxT("UnregisterClass(MDI child)")); - - retval = false; - } - - // "no redraw" MDI child frame - if ( !::UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) ) - { - wxLogLastError(wxT("UnregisterClass(no redraw MDI child)")); - - retval = false; + if ( gs_regClassesInfo[n].regname == name || + gs_regClassesInfo[n].regnameNR == name ) + return true; } - // canvas class name - if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) ) - { - wxLogLastError(wxT("UnregisterClass(canvas)")); - - retval = false; - } + return false; +} - if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) ) +void wxApp::UnregisterWindowClasses() +{ + const size_t count = gs_regClassesInfo.size(); + for ( size_t n = 0; n < count; n++ ) { - wxLogLastError(wxT("UnregisterClass(no redraw canvas)")); + const ClassRegInfo& regClass = gs_regClassesInfo[n]; + if ( !::UnregisterClass(regClass.regname.c_str(), wxGetInstance()) ) + { + wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"), + regClass.regname)); + } - retval = false; + if ( !::UnregisterClass(regClass.regnameNR.c_str(), wxGetInstance()) ) + { + wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"), + regClass.regnameNR)); + } } -#endif // __WXMICROWIN__ - return retval; + gs_regClassesInfo.clear(); } void wxApp::CleanUp() { - // all objects pending for deletion must be deleted first, otherwise we - // would crash when they use wxWinHandleHash (and UnregisterWindowClasses() - // call wouldn't succeed as long as any windows still exist), so call the - // base class method first and only then do our clean up + // all objects pending for deletion must be deleted first, otherwise + // UnregisterWindowClasses() call wouldn't succeed (because windows + // using the classes being unregistered still exist), so call the base + // class method first and only then do our clean up wxAppBase::CleanUp(); #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) @@ -527,14 +773,6 @@ void wxApp::CleanUp() // which case the registration will fail after the first time if we don't // unregister the classes now UnregisterWindowClasses(); - - delete wxWinHandleHash; - wxWinHandleHash = NULL; - -#ifdef __WXWINCE__ - free( wxCanvasClassName ); - free( wxCanvasClassNameNR ); -#endif } // ---------------------------------------------------------------------------- @@ -571,15 +809,34 @@ void wxApp::WakeUpIdle() // 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 *topWindow = wxTheApp->GetTopWindow(); + wxWindow * const topWindow = wxTheApp->GetTopWindow(); if ( topWindow ) { - if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) ) + HWND hwndTop = GetHwndOf(topWindow); + + // Do not post WM_NULL if there's already a pending WM_NULL to avoid + // overflowing the message queue. + // + // Notice that due to a limitation of PeekMessage() API (which handles + // 0,0 range specially), we have to check the range from 0-1 instead. + // This still makes it possible to overflow the queue with WM_NULLs by + // interspersing the calles to WakeUpIdle() with windows creation but + // it should be rather hard to do it accidentally. + MSG msg; + if ( !::PeekMessage(&msg, hwndTop, 0, 1, PM_NOREMOVE) || + ::PeekMessage(&msg, hwndTop, 1, 1, PM_NOREMOVE) ) { - // should never happen - wxLogLastError(wxT("PostMessage(WM_NULL)")); + if ( !::PostMessage(hwndTop, WM_NULL, 0, 0) ) + { + // should never happen + wxLogLastError(wxT("PostMessage(WM_NULL)")); + } } } +#if wxUSE_THREADS + else + wxWakeUpMainThread(); +#endif // wxUSE_THREADS } // ---------------------------------------------------------------------------- @@ -588,8 +845,24 @@ void wxApp::WakeUpIdle() void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { - if (GetTopWindow()) - GetTopWindow()->Close(true); + // Windows will terminate the process soon after we return from + // WM_ENDSESSION handler or when we delete our last window, so make sure we + // at least execute our cleanup code before + + // prevent the window from being destroyed when the corresponding wxTLW is + // destroyed: this will result in a leak of a HWND, of course, but who + // cares when the process is being killed anyhow + if ( !wxTopLevelWindows.empty() ) + wxTopLevelWindows[0]->SetHWND(0); + + const int rc = OnExit(); + + wxEntryCleanup(); + + // calling exit() instead of ExitProcess() or not doing anything at all and + // being killed by Windows has the advantage of executing the dtors of + // global objects + exit(rc); } // Default behaviour: close the application with prompts. The @@ -607,6 +880,9 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) // system DLL versions // ---------------------------------------------------------------------------- +// these functions have trivial inline implementations for CE +#ifndef __WXWINCE__ + #if wxUSE_DYNLIB_CLASS namespace @@ -627,7 +903,7 @@ int CallDllGetVersion(wxDynamicLibrary& dll) HRESULT hr = (*pfnDllGetVersion)(&dvi); if ( FAILED(hr) ) { - wxLogApiError(_T("DllGetVersion"), hr); + wxLogApiError(wxT("DllGetVersion"), hr); return 0; } @@ -651,8 +927,11 @@ int wxApp::GetComCtl32Version() // we're prepared to handle the errors wxLogNull noLog; - // the DLL should really be available - wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM); + // we don't want to load comctl32.dll, it should be already loaded but, + // depending on the OS version and the presence of the manifest, it can + // be either v5 or v6 and instead of trying to guess it just get the + // handle of the already loaded version + wxLoadedDLL dllComCtl32(wxT("comctl32.dll")); if ( !dllComCtl32.IsLoaded() ) { s_verComCtl32 = 0; @@ -667,7 +946,7 @@ int wxApp::GetComCtl32Version() if ( !s_verComCtl32 ) { // InitCommonControlsEx is unique to 4.70 and later - void *pfn = dllComCtl32.GetSymbol(_T("InitCommonControlsEx")); + void *pfn = dllComCtl32.GetSymbol(wxT("InitCommonControlsEx")); if ( !pfn ) { // not found, must be 4.00 @@ -677,7 +956,7 @@ int wxApp::GetComCtl32Version() { // many symbols appeared in comctl32 4.71, could use any of // them except may be DllInstall() - pfn = dllComCtl32.GetSymbol(_T("InitializeFlatSB")); + pfn = dllComCtl32.GetSymbol(wxT("InitializeFlatSB")); if ( !pfn ) { // not found, must be 4.70 @@ -704,7 +983,7 @@ int wxApp::GetShell32Version() // we're prepared to handle the errors wxLogNull noLog; - wxDynamicLibrary dllShell32(_T("shell32.dll"), wxDL_VERBATIM); + wxDynamicLibrary dllShell32(wxT("shell32.dll"), wxDL_VERBATIM); if ( dllShell32.IsLoaded() ) { s_verShell32 = CallDllGetVersion(dllShell32); @@ -742,59 +1021,7 @@ int wxApp::GetShell32Version() #endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS -// ---------------------------------------------------------------------------- -// Yield to incoming messages -// ---------------------------------------------------------------------------- - -bool wxApp::Yield(bool onlyIfNeeded) -{ - // MT-FIXME - static bool s_inYield = 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(); -#endif // wxUSE_LOG - - if ( s_inYield ) - { - if ( !onlyIfNeeded ) - { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); - } - - return false; - } - - s_inYield = true; - - // we don't want to process WM_QUIT from here - it should be processed in - // the main event loop in order to stop it - 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(); - -#if wxUSE_LOG - // let the logs be flashed again - wxLog::Resume(); -#endif // wxUSE_LOG - - s_inYield = false; - - return true; -} +#endif // !__WXWINCE__ #if wxUSE_EXCEPTIONS @@ -810,10 +1037,10 @@ bool wxApp::OnExceptionInMainLoop() ::MessageBox ( NULL, - _T("An unhandled exception occurred. Press \"Abort\" to \ + wxT("An unhandled exception occurred. Press \"Abort\" to \ terminate the program,\r\n\ \"Retry\" to exit the program normally and \"Ignore\" to try to continue."), - _T("Unhandled exception"), + wxT("Unhandled exception"), MB_ABORTRETRYIGNORE | MB_ICONERROR| MB_TASKMODAL @@ -824,7 +1051,7 @@ terminate the program,\r\n\ throw; default: - wxFAIL_MSG( _T("unexpected MessageBox() return code") ); + wxFAIL_MSG( wxT("unexpected MessageBox() return code") ); // fall through case IDRETRY: