X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/955a919785b76a1826e6b8d55f696a0dfb62a318..6cab4fcac7fe26d9ae5a1d29066e0893d689bb38:/src/msw/app.cpp?ds=sidebyside diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 03551b3c17..eccd8787f4 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/msw/app.cpp // Purpose: wxApp // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "app.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,6 +25,8 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" + #include "wx/dynarray.h" #include "wx/frame.h" #include "wx/app.h" #include "wx/utils.h" @@ -42,28 +40,23 @@ #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/crt.h" #include "wx/log.h" + #include "wx/module.h" #endif #include "wx/apptrait.h" #include "wx/filename.h" -#include "wx/module.h" +#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" - -#if wxUSE_THREADS - #include "wx/thread.h" - - // define the array of MSG strutures - WX_DECLARE_OBJARRAY(MSG, wxMsgArray); - - #include "wx/arrimpl.cpp" - - WX_DEFINE_OBJARRAY(wxMsgArray); -#endif // wxUSE_THREADS +#include "wx/msw/dc.h" +#include "wx/msw/ole/oleutils.h" +#include "wx/msw/private/timer.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -71,12 +64,17 @@ // OLE is used for drag-and-drop, clipboard, OLE Automation..., but some // compilers don't support it (missing headers, libs, ...) -#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__) +#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) #undef wxUSE_OLE #define wxUSE_OLE 0 #endif // broken compilers +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) + #include + #include +#endif + #if wxUSE_OLE #include #endif @@ -84,59 +82,60 @@ #include #include -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__)) - #include -#endif - -// ---------------------------------------------------------------------------- -// conditional compilation -// ---------------------------------------------------------------------------- +#include "wx/msw/missing.h" -// The macro _WIN32_IE is defined by commctrl.h (unless it had already been -// defined before) and shows us what common control features are available -// during the compile time (it doesn't mean that they will be available during -// the run-time, use GetComCtl32Version() to test for them!). The possible -// values are: +// instead of including which is not part of the core SDK and not +// shipped at all with other compilers, we always define the parts of it we +// need here ourselves // -// 0x0200 for comctl32.dll 4.00 shipped with Win95/NT 4.0 -// 0x0300 4.70 IE 3.x -// 0x0400 4.71 IE 4.0 -// 0x0401 4.72 IE 4.01 and Win98 -// 0x0500 5.00 IE 5.x and NT 5.0 (Win2000) - -#ifndef _WIN32_IE - // minimal set of features by default - #define _WIN32_IE 0x0200 -#endif +// NB: DLLVER_PLATFORM_WINDOWS will be defined if shlwapi.h had been somehow +// included already +#ifndef DLLVER_PLATFORM_WINDOWS + // hopefully we don't need to change packing as DWORDs should be already + // correctly aligned + struct DLLVERSIONINFO + { + DWORD cbSize; + DWORD dwMajorVersion; // Major version + DWORD dwMinorVersion; // Minor version + DWORD dwBuildNumber; // Build number + DWORD dwPlatformID; // DLLVER_PLATFORM_* + }; + + typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *); +#endif // defined(DLLVERSIONINFO) -#if _WIN32_IE >= 0x0300 && \ - (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \ - !defined(__CYGWIN__) && !defined(__WXWINCE__) - #include +#ifndef ATTACH_PARENT_PROCESS + #define ATTACH_PARENT_PROCESS ((DWORD)-1) #endif // --------------------------------------------------------------------------- // global variables // --------------------------------------------------------------------------- -extern wxList WXDLLEXPORT wxPendingDelete; - #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) extern void wxSetKeyboardHook(bool doIt); #endif -MSG s_currentMsg; +// 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 +{ + // the base name of the class: this is used to construct the unique name in + // RegisterClassWithUniqueNames() + wxString basename; + + // the name of the registered class with and without CS_[HV]REDRAW styles + wxString regname, + regnameNR; +}; -// NB: all "NoRedraw" classes must have the same names as the "normal" classes -// with NR suffix - wxWindow::MSWCreate() supposes this -const wxChar *wxCanvasClassName = wxT("wxWindowClass"); -const wxChar *wxCanvasClassNameNR = wxT("wxWindowClassNR"); -const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass"); -const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); -const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); -const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); +namespace +{ -HBRUSH wxDisableButtonBrush = (HBRUSH) 0; +wxVector gs_regClassesInfo; + +} // anonymous namespace // ---------------------------------------------------------------------------- // private functions @@ -210,7 +209,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig) { wxEndBusyCursor(); - const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig; + ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig; delete data->wd; @@ -218,602 +217,582 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig) // the other windows reenabled, the activation is going to return to the // window which had had it before data->winActive->Destroy(); + + // also delete the temporary data object itself + delete data; } bool wxGUIAppTraits::DoMessageFromThreadWait() { - return !wxTheApp || wxTheApp->DoMessage(); + // we should return false only if the app should exit, i.e. only if + // Dispatch() determines that the main event loop should terminate + wxEventLoopBase * const evtLoop = wxEventLoop::GetActive(); + if ( !evtLoop || !evtLoop->Pending() ) + { + // no events means no quit event + return true; + } + + return evtLoop->Dispatch(); } -// =========================================================================== -// wxApp implementation -// =========================================================================== +DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread) +{ + // 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() ) + return DoSimpleWaitForThread(hThread); + + return ::MsgWaitForMultipleObjects + ( + 1, // number of objects to wait for + (HANDLE *)&hThread, // the objects + false, // wait for any objects, not all + INFINITE, // no timeout + QS_ALLINPUT | // return as soon as there are any events + QS_ALLPOSTMESSAGE + ); +} -int wxApp::m_nCmdShow = SW_SHOWNORMAL; +wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const +{ + OSVERSIONINFO info; + wxZeroMemory(info); + + // on Windows, the toolkit version is the same of the OS version + // as Windows integrates the OS kernel with the GUI toolkit. + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if ( ::GetVersionEx(&info) ) + { + if ( majVer ) + *majVer = info.dwMajorVersion; + if ( minVer ) + *minVer = info.dwMinorVersion; + } + +#if defined(__WXHANDHELD__) || defined(__WXWINCE__) + return wxPORT_WINCE; +#else + return wxPORT_MSW; +#endif +} + +#if wxUSE_TIMER + +wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) +{ + return new wxMSWTimerImpl(timer); +} + +#endif // wxUSE_TIMER + +wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() +{ + return new wxEventLoop; +} // --------------------------------------------------------------------------- -// wxWin macros +// Stuff for using console from the GUI applications // --------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) +#ifndef __WXWINCE__ -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) - EVT_END_SESSION(wxApp::OnEndSession) - EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) -END_EVENT_TABLE() +#include -// class to ensure that wxAppBase::CleanUp() is called if our Initialize() -// fails -class wxCallBaseCleanup +namespace { -public: - wxCallBaseCleanup(wxApp *app) : m_app(app) { } - ~wxCallBaseCleanup() { if ( m_app ) m_app->wxAppBase::CleanUp(); } - void Dismiss() { m_app = NULL; } +/* + Helper class to manipulate console from a GUI app. -private: - wxApp *m_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 -//// Initialize -bool wxApp::Initialize(int& argc, wxChar **argv) + 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 { - if ( !wxAppBase::Initialize(argc, argv) ) - return false; +public: + // default ctor does nothing, call Init() before using this class + wxConsoleStderr() + { + m_hStderr = INVALID_HANDLE_VALUE; + m_historyLen = + m_dataLen = + m_dataLine = 0; - // ensure that base cleanup is done if we return too early - wxCallBaseCleanup callBaseCleanup(this); + m_ok = -1; + } - // the first thing to do is to check if we're trying to run an Unicode - // program under Win9x w/o MSLU emulation layer - if so, abort right now - // as it has no chance to work -#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU - if ( wxGetOsVersion() != wxWINDOWS_NT && wxGetOsVersion() != wxWINDOWS_CE ) + ~wxConsoleStderr() { - // note that we can use MessageBoxW() as it's implemented even under - // Win9x - OTOH, we can't use wxGetTranslation() because the file APIs - // used by wxLocale are not - ::MessageBox - ( - NULL, - _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."), - _T("wxWindows Fatal Error"), - MB_ICONERROR | MB_OK - ); - - return FALSE; + if ( m_hStderr != INVALID_HANDLE_VALUE ) + { + if ( !::FreeConsole() ) + { + wxLogLastError(_T("FreeConsole")); + } + } } -#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU -#if defined(__WIN95__) && !defined(__WXMICROWIN__) - InitCommonControls(); -#endif // __WIN95__ + // 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(); -#if wxUSE_OLE || wxUSE_DRAG_AND_DROP + // no need to call IsHistoryUnchanged() as we just initialized + // m_history anyhow + return m_ok == 1; + } -#ifdef __WIN16__ - // for OLE, enlarge message queue to be as large as possible - int iMsg = 96; - while (!SetMessageQueue(iMsg) && (iMsg -= 8)) - ; -#endif // Win16 + return m_ok && IsHistoryUnchanged(); + } -#if wxUSE_OLE - // we need to initialize OLE library -#ifdef __WXWINCE__ - if ( FAILED(::CoInitializeEx(NULL, COINIT_MULTITHREADED)) ) - wxLogError(_("Cannot initialize OLE")); -#else - if ( FAILED(::OleInitialize(NULL)) ) - wxLogError(_("Cannot initialize OLE")); -#endif -#endif -#endif // wxUSE_OLE + // output the provided text on the console, return true if ok + bool Write(const wxString& text); -#if wxUSE_CTL3D - if (!Ctl3dRegister(wxhInstance)) - wxLogError(wxT("Cannot register CTL3D")); +private: + // called by Init() once only to do the real initialization + bool DoInit(); - Ctl3dAutoSubclass(wxhInstance); -#endif // wxUSE_CTL3D + // retrieve the command line history into the provided buffer and return + // its length + int GetCommandHistory(wxWxCharBuffer& buf) const; - RegisterWindowClasses(); + // check if the console history has changed + bool IsHistoryUnchanged() const; -#if defined(__WXMICROWIN__) && !defined(__WXWINCE__) - // Create the brush for disabling bitmap buttons + int m_ok; // initially -1, set to true or false by Init() - LOGBRUSH lb; - lb.lbStyle = BS_PATTERN; - lb.lbColor = 0; - lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") ); - if ( lb.lbHatch ) - { - wxDisableButtonBrush = ::CreateBrushIndirect( & lb ); - ::DeleteObject( (HGDIOBJ)lb.lbHatch ); - } - //else: wxWindows resources are probably not linked in -#endif + wxDynamicLibrary m_dllKernel32; -#if wxUSE_PENWINDOWS - wxRegisterPenWin(); -#endif + HANDLE m_hStderr; // console handle, if it's valid we must call + // FreeConsole() (even if m_ok != 1) - wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100); + wxWxCharBuffer m_history; // command history on startup + int m_historyLen; // length command history buffer - // This is to foil optimizations in Visual C++ that throw out dummy.obj. - // PLEASE DO NOT ALTER THIS. -#if defined(__VISUALC__) && defined(__WIN16__) && !defined(WXMAKINGDLL) - extern char wxDummyChar; - if (wxDummyChar) wxDummyChar++; -#endif + wxCharBuffer m_data; // data between empty line and cursor position + int m_dataLen; // length data buffer + int m_dataLine; // line offset -#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) - wxSetKeyboardHook(TRUE); -#endif + typedef DWORD (WINAPI *GetConsoleCommandHistory_t)(LPTSTR sCommands, + DWORD nBufferLength, + LPCTSTR sExeName); + typedef DWORD (WINAPI *GetConsoleCommandHistoryLength_t)(LPCTSTR sExeName); - callBaseCleanup.Dismiss(); + GetConsoleCommandHistory_t m_pfnGetConsoleCommandHistory; + GetConsoleCommandHistoryLength_t m_pfnGetConsoleCommandHistoryLength; - return true; -} - -// --------------------------------------------------------------------------- -// RegisterWindowClasses -// --------------------------------------------------------------------------- + DECLARE_NO_COPY_CLASS(wxConsoleStderr) +}; -// 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() +bool wxConsoleStderr::DoInit() { - WNDCLASS wndclass; - wxZeroMemory(wndclass); + HANDLE hStderr = ::GetStdHandle(STD_ERROR_HANDLE); - // 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; + if ( hStderr == INVALID_HANDLE_VALUE || !hStderr ) + return false; - // the fields which are common to all classes - wndclass.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass.hInstance = wxhInstance; - wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW); + if ( !m_dllKernel32.Load(_T("kernel32.dll")) ) + return false; - // Register the frame window class. - wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); - wndclass.lpszClassName = wxCanvasClassName; - wndclass.style = styleNormal; + typedef BOOL (WINAPI *AttachConsole_t)(DWORD dwProcessId); + AttachConsole_t wxDL_INIT_FUNC(pfn, AttachConsole, m_dllKernel32); - if ( !RegisterClass(&wndclass) ) - { - wxLogLastError(wxT("RegisterClass(frame)")); - } + if ( !pfnAttachConsole || !pfnAttachConsole(ATTACH_PARENT_PROCESS) ) + return false; - // "no redraw" frame - wndclass.lpszClassName = wxCanvasClassNameNR; - wndclass.style = styleNoRedraw; + // console attached, set m_hStderr now to ensure that we free it in the + // dtor + m_hStderr = hStderr; - if ( !RegisterClass(&wndclass) ) - { - wxLogLastError(wxT("RegisterClass(no redraw frame)")); - } + wxDL_INIT_FUNC_AW(m_pfn, GetConsoleCommandHistory, m_dllKernel32); + if ( !m_pfnGetConsoleCommandHistory ) + return false; - // Register the MDI frame window class. - wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves - wndclass.lpszClassName = wxMDIFrameClassName; - wndclass.style = styleNormal; + 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; - if ( !RegisterClass(&wndclass) ) - { - wxLogLastError(wxT("RegisterClass(MDI parent)")); - } - // "no redraw" MDI frame - wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw; - wndclass.style = styleNoRedraw; + // now find the first blank line above the current position + CONSOLE_SCREEN_BUFFER_INFO csbi; - if ( !RegisterClass(&wndclass) ) + if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) ) { - wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)")); + wxLogLastError(_T("GetConsoleScreenBufferInfo")); + return false; } - // Register the MDI child frame window class. - wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wndclass.lpszClassName = wxMDIChildFrameClassName; - wndclass.style = styleNormal; + COORD pos; + pos.X = 0; + pos.Y = csbi.dwCursorPosition.Y + 1; - if ( !RegisterClass(&wndclass) ) + // we decide that a line is empty if first 4 characters are spaces + DWORD ret; + char buf[4]; + do { - wxLogLastError(wxT("RegisterClass(MDI child)")); - } + pos.Y--; + if ( !::ReadConsoleOutputCharacterA(m_hStderr, buf, WXSIZEOF(buf), + pos, &ret) ) + { + wxLogLastError(_T("ReadConsoleOutputCharacterA")); + return false; + } + } while ( wxStrncmp(" ", buf, WXSIZEOF(buf)) != 0 ); - // "no redraw" MDI child frame - wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw; - wndclass.style = styleNoRedraw; + // 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 ( !RegisterClass(&wndclass) ) + if ( m_dataLen > 0 ) { - wxLogLastError(wxT("RegisterClass(no redraw MDI child)")); + m_data.extend(m_dataLen); + if ( !::ReadConsoleOutputCharacterA(m_hStderr, m_data.data(), m_dataLen, + pos, &ret) ) + { + wxLogLastError(_T("ReadConsoleOutputCharacterA")); + return false; + } } - return TRUE; + return true; } -// --------------------------------------------------------------------------- -// UnregisterWindowClasses -// --------------------------------------------------------------------------- - -bool wxApp::UnregisterWindowClasses() +int wxConsoleStderr::GetCommandHistory(wxWxCharBuffer& buf) const { - bool retval = TRUE; + // these functions are internal and may only be called by cmd.exe + static const wxChar *CMD_EXE = _T("cmd.exe"); -#ifndef __WXMICROWIN__ - // MDI frame window class. - if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) ) + const int len = m_pfnGetConsoleCommandHistoryLength(CMD_EXE); + if ( len ) { - wxLogLastError(wxT("UnregisterClass(MDI parent)")); + buf.extend(len); - retval = FALSE; - } + int len2 = m_pfnGetConsoleCommandHistory(buf.data(), len, CMD_EXE); - // "no redraw" MDI frame - if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) ) - { - wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)")); +#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 - retval = FALSE; + if ( len2 != len ) + { + wxFAIL_MSG( _T("failed getting history?") ); + } } - // MDI child frame window class. - if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) ) - { - wxLogLastError(wxT("UnregisterClass(MDI child)")); + return len; +} - retval = FALSE; - } +bool wxConsoleStderr::IsHistoryUnchanged() const +{ + wxASSERT_MSG( m_ok == 1, _T("shouldn't be called if not initialized") ); - // "no redraw" MDI child frame - if ( !::UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) ) - { - wxLogLastError(wxT("UnregisterClass(no redraw MDI child)")); + // get (possibly changed) command history + wxWxCharBuffer history; + const int historyLen = GetCommandHistory(history); - retval = FALSE; - } + // and compare it with the original one + return historyLen == m_historyLen && history && + memcmp(m_history, history, historyLen) == 0; +} - // canvas class name - if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) ) +bool wxConsoleStderr::Write(const wxString& text) +{ + wxASSERT_MSG( m_hStderr != INVALID_HANDLE_VALUE, + _T("should only be called if Init() returned true") ); + + // get current position + CONSOLE_SCREEN_BUFFER_INFO csbi; + if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) ) { - wxLogLastError(wxT("UnregisterClass(canvas)")); + wxLogLastError(_T("GetConsoleScreenBufferInfo")); + return false; + } - retval = 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(_T("SetConsoleCursorPosition")); + return false; } - if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) ) + DWORD ret; + if ( !::FillConsoleOutputCharacter(m_hStderr, _T(' '), m_dataLen, + csbi.dwCursorPosition, &ret) ) { - wxLogLastError(wxT("UnregisterClass(no redraw canvas)")); + wxLogLastError(_T("FillConsoleOutputCharacter")); + return false; + } - retval = FALSE; + if ( !::WriteConsole(m_hStderr, text.wx_str(), text.length(), &ret, NULL) ) + { + wxLogLastError(_T("WriteConsole")); + return false; } -#endif // __WXMICROWIN__ - return retval; + WriteConsoleA(m_hStderr, m_data, m_dataLen, &ret, 0); + + return true; } -void wxApp::CleanUp() -{ -#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) - wxSetKeyboardHook(FALSE); -#endif +wxConsoleStderr s_consoleStderr; -#if wxUSE_PENWINDOWS - wxCleanUpPenWin(); -#endif +} // anonymous namespace - if ( wxDisableButtonBrush ) - ::DeleteObject( wxDisableButtonBrush ); +bool wxGUIAppTraits::CanUseStderr() +{ + return s_consoleStderr.IsOkToUse(); +} -#if wxUSE_OLE -#ifdef __WXWINCE__ - ::CoUninitialize(); -#else - ::OleUninitialize(); -#endif -#endif +bool wxGUIAppTraits::WriteToStderr(const wxString& text) +{ + return s_consoleStderr.IsOkToUse() && s_consoleStderr.Write(text); +} - // for an EXE the classes are unregistered when it terminates but DLL may - // be loaded several times (load/unload/load) into the same process in - // which case the registration will fail after the first time if we don't - // unregister the classes now - UnregisterWindowClasses(); +#endif // !__WXWINCE__ -#if wxUSE_CTL3D - Ctl3dUnregister(wxhInstance); -#endif +// =========================================================================== +// wxApp implementation +// =========================================================================== - delete wxWinHandleHash; - wxWinHandleHash = NULL; +int wxApp::m_nCmdShow = SW_SHOWNORMAL; - wxAppBase::CleanUp(); -} +// --------------------------------------------------------------------------- +// wxWin macros +// --------------------------------------------------------------------------- -// ---------------------------------------------------------------------------- -// wxApp ctor/dtor -// ---------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) -wxApp::wxApp() -{ - m_printMode = wxPRINT_WINDOWS; -} +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) + EVT_END_SESSION(wxApp::OnEndSession) + EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) +END_EVENT_TABLE() -wxApp::~wxApp() +// class to ensure that wxAppBase::CleanUp() is called if our Initialize() +// fails +class wxCallBaseCleanup { - // our cmd line arguments are allocated inside wxEntry(HINSTANCE), they - // don't come from main(), so we have to free them - - while ( argc ) - { - // m_argv elements were allocated by wxStrdup() - free(argv[--argc]); - } +public: + wxCallBaseCleanup(wxApp *app) : m_app(app) { } + ~wxCallBaseCleanup() { if ( m_app ) m_app->wxAppBase::CleanUp(); } - // but m_argv itself -- using new[] - delete [] argv; -} + void Dismiss() { m_app = NULL; } -bool wxApp::Initialized() -{ -#ifndef _WINDLL - if (GetTopWindow()) - return TRUE; - else - return FALSE; -#else // Assume initialized if DLL (no way of telling) - return TRUE; -#endif -} +private: + wxApp *m_app; +}; -/* - * 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() +//// Initialize +bool wxApp::Initialize(int& argc, wxChar **argv) { - BOOL rc = ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0); - if ( rc == 0 ) - { - // got WM_QUIT - m_keepGoing = FALSE; - - return FALSE; - } - else if ( rc == -1 ) - { - // should never happen, but let's test for it nevertheless - wxLogLastError(wxT("GetMessage")); - } - else - { -#if wxUSE_THREADS - wxASSERT_MSG( wxThread::IsMain(), - wxT("only the main thread can process Windows messages") ); - - static bool s_hadGuiLock = TRUE; - static wxMsgArray s_aSavedMessages; + if ( !wxAppBase::Initialize(argc, argv) ) + return false; - // 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() ) - { - s_hadGuiLock = FALSE; + // ensure that base cleanup is done if we return too early + wxCallBaseCleanup callBaseCleanup(this); - // leave out WM_COMMAND messages: too dangerous, sometimes - // the message will be processed twice - if ( !wxIsWaitingForThread() || - s_currentMsg.message != WM_COMMAND ) - { - s_aSavedMessages.Add(s_currentMsg); - } +#if !defined(__WXMICROWIN__) + InitCommonControls(); +#endif // !defined(__WXMICROWIN__) - return TRUE; - } - else - { - // 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 ( !s_hadGuiLock ) - { - s_hadGuiLock = TRUE; +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHInitExtraControls(); +#endif - size_t count = s_aSavedMessages.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - MSG& msg = s_aSavedMessages[n]; +#ifndef __WXWINCE__ + // Don't show a message box if a function such as SHGetFileInfo + // fails to find a device. + SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); +#endif - DoMessage((WXMSG *)&msg); - } + wxOleInitialize(); - s_aSavedMessages.Empty(); - } - } -#endif // wxUSE_THREADS +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) + wxSetKeyboardHook(true); +#endif - // Process the message - DoMessage((WXMSG *)&s_currentMsg); - } + callBaseCleanup.Dismiss(); - return TRUE; + return true; } -void wxApp::DoMessage(WXMSG *pMsg) +// --------------------------------------------------------------------------- +// Win32 window class registration +// --------------------------------------------------------------------------- + +/* static */ +const wxChar *wxApp::GetRegisteredClassName(const wxChar *name, + int bgBrushCol, + int extraStyles) { - if ( !ProcessMessage(pMsg) ) + const size_t count = gs_regClassesInfo.size(); + for ( size_t n = 0; n < count; n++ ) { - ::TranslateMessage((MSG *)pMsg); - ::DispatchMessage((MSG *)pMsg); + if ( gs_regClassesInfo[n].basename == name ) + return gs_regClassesInfo[n].regname.c_str(); } -} - -/* - * 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_keepGoing = TRUE; + // we need to register this class + WNDCLASS wndclass; + wxZeroMemory(wndclass); - while ( m_keepGoing ) + wndclass.lpfnWndProc = (WNDPROC)wxWndProc; + wndclass.hInstance = wxhInstance; + wndclass.hCursor = ::LoadCursor(NULL, IDC_ARROW); + wndclass.hbrBackground = (HBRUSH)wxUIntToPtr(bgBrushCol + 1); + wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | extraStyles; + + + ClassRegInfo regClass; + regClass.basename = name; + + // constuct a unique suffix to allow registering the class with the same + // base name in a main application using wxWidgets and a DLL using + // wxWidgets loaded into its address space: as gs_regClassesInfo variable + // is different in them, we're going to obtain a unique prefix by using its + // address here + regClass.regname = regClass.basename + + wxString::Format(wxT("@%p"), &gs_regClassesInfo); + wndclass.lpszClassName = regClass.regname.wx_str(); + if ( !::RegisterClass(&wndclass) ) { -#if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); -#endif // wxUSE_THREADS - - while ( !Pending() && ProcessIdle() ) - ; + wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"), + regClass.regname)); + return NULL; + } - // a message came or no more idle processing to do - DoMessage(); + // NB: remember that code elsewhere supposes that no redraw class names + // use the same names as normal classes with "NR" suffix so we must put + // "NR" at the end instead of using more natural basename+"NR"+suffix + regClass.regnameNR = regClass.regname + GetNoRedrawClassSuffix(); + wndclass.style &= ~(CS_HREDRAW | CS_VREDRAW); + wndclass.lpszClassName = regClass.regnameNR.wx_str(); + if ( !::RegisterClass(&wndclass) ) + { + wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"), + regClass.regname)); + ::UnregisterClass(regClass.regname.c_str(), wxhInstance); + return NULL; } - return s_currentMsg.wParam; -} + gs_regClassesInfo.push_back(regClass); -void wxApp::ExitMainLoop() -{ - // this will set m_keepGoing to FALSE a bit later - ::PostQuitMessage(0); + // 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(); } -bool wxApp::Pending() +bool wxApp::IsRegisteredClassName(const wxString& name) { - return ::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0; -} + const size_t count = gs_regClassesInfo.size(); + for ( size_t n = 0; n < count; n++ ) + { + if ( gs_regClassesInfo[n].regname == name || + gs_regClassesInfo[n].regnameNR == name ) + return true; + } -void wxApp::Dispatch() -{ - DoMessage(); + return false; } -/* - * Give all windows a chance to preprocess - * the message. Some may have accelerator tables, or have - * MDI complications. - */ - -bool wxApp::ProcessMessage(WXMSG *wxmsg) +void wxApp::UnregisterWindowClasses() { - MSG *msg = (MSG *)wxmsg; - HWND hwnd = msg->hwnd; - wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd); - - // this may happen if the event occured in a standard modeless dialog (the - // only example of which I know of is the find/replace dialog) - then call - // IsDialogMessage() to make TAB navigation in it work - if ( !wndThis ) + const size_t count = gs_regClassesInfo.size(); + for ( size_t n = 0; n < count; n++ ) { - // we need to find the dialog containing this control as - // IsDialogMessage() just eats all the messages (i.e. returns TRUE for - // them) if we call it for the control itself - while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD ) + const ClassRegInfo& regClass = gs_regClassesInfo[n]; + if ( !::UnregisterClass(regClass.regname.c_str(), wxhInstance) ) { - hwnd = ::GetParent(hwnd); + wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"), + regClass.regname)); } - return hwnd && ::IsDialogMessage(hwnd, msg) != 0; - } - -#if wxUSE_TOOLTIPS - // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to - // popup the tooltip bubbles - if ( (msg->message == WM_MOUSEMOVE) ) - { - wxToolTip *tt = wndThis->GetToolTip(); - if ( tt ) + if ( !::UnregisterClass(regClass.regnameNR.c_str(), wxhInstance) ) { - tt->RelayEvent(wxmsg); + wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"), + regClass.regnameNR)); } } -#endif // wxUSE_TOOLTIPS - // 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 ( !wndThis->MSWShouldPreProcessMessage(wxmsg) ) - { - return FALSE; - } - - // try translations first: the accelerators override everything - wxWindow *wnd; + gs_regClassesInfo.clear(); +} - for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) - { - if ( wnd->MSWTranslateMessage(wxmsg)) - return TRUE; +void wxApp::CleanUp() +{ + // 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(); - // stop at first top level window, i.e. don't try to process the key - // strokes originating in a dialog using the accelerators of the parent - // frame - this doesn't make much sense - if ( wnd->IsTopLevel() ) - break; - } +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) + wxSetKeyboardHook(false); +#endif - // now try the other hooks (kbd navigation is handled here): we start from - // wndThis->GetParent() because wndThis->MSWProcessMessage() was already - // called above - for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() ) - { - if ( wnd->MSWProcessMessage(wxmsg) ) - return TRUE; - } + wxOleUninitialize(); - // no special preprocessing for this message, dispatch it normally - return FALSE; + // for an EXE the classes are unregistered when it terminates but DLL may + // be loaded several times (load/unload/load) into the same process in + // which case the registration will fail after the first time if we don't + // unregister the classes now + UnregisterWindowClasses(); } -// this is a temporary hack and will be replaced by using wxEventLoop in the -// future -// -// it is needed to allow other event loops (currently only one: the modal -// dialog one) to reset the OnIdle() semaphore because otherwise OnIdle() -// wouldn't do anything while a modal dialog shown from OnIdle() call is shown. -bool wxIsInOnIdleFlag = FALSE; +// ---------------------------------------------------------------------------- +// wxApp ctor/dtor +// ---------------------------------------------------------------------------- + +wxApp::wxApp() +{ + m_printMode = wxPRINT_WINDOWS; +} -void wxApp::OnIdle(wxIdleEvent& event) +wxApp::~wxApp() { - // Avoid recursion (via ProcessEvent default case) - if ( wxIsInOnIdleFlag ) - return; +} - wxIsInOnIdleFlag = TRUE; - - wxAppBase::OnIdle(event); +// ---------------------------------------------------------------------------- +// wxApp idle handling +// ---------------------------------------------------------------------------- +void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event)) +{ #if wxUSE_DC_CACHEING // automated DC cache management: clear the cached DCs and bitmap // if it's likely that the app has finished with them, that is, we // get an idle event and we're not dragging anything. if (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON)) - wxDC::ClearCache(); + wxMSWDCImpl::ClearCache(); #endif // wxUSE_DC_CACHEING - - wxIsInOnIdleFlag = FALSE; } void wxApp::WakeUpIdle() @@ -822,21 +801,56 @@ 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)")); + } } } } +// ---------------------------------------------------------------------------- +// other wxApp event hanlders +// ---------------------------------------------------------------------------- + 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 @@ -846,151 +860,191 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) if (GetTopWindow()) { if (!GetTopWindow()->Close(!event.CanVeto())) - event.Veto(TRUE); + event.Veto(true); } } -typedef struct _WXADllVersionInfo +// ---------------------------------------------------------------------------- +// system DLL versions +// ---------------------------------------------------------------------------- + +// these functions have trivial inline implementations for CE +#ifndef __WXWINCE__ + +#if wxUSE_DYNLIB_CLASS + +namespace { - DWORD cbSize; - DWORD dwMajorVersion; // Major version - DWORD dwMinorVersion; // Minor version - DWORD dwBuildNumber; // Build number - DWORD dwPlatformID; // DLLVER_PLATFORM_* -} WXADLLVERSIONINFO; -typedef HRESULT (CALLBACK* WXADLLGETVERSIONPROC)(WXADLLVERSIONINFO *); +// helper function: retrieve the DLL version by using DllGetVersion(), returns +// 0 if the DLL doesn't export such function +int CallDllGetVersion(wxDynamicLibrary& dll) +{ + // now check if the function is available during run-time + wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dll ); + if ( !pfnDllGetVersion ) + return 0; + + DLLVERSIONINFO dvi; + dvi.cbSize = sizeof(dvi); + + HRESULT hr = (*pfnDllGetVersion)(&dvi); + if ( FAILED(hr) ) + { + wxLogApiError(_T("DllGetVersion"), hr); + + return 0; + } + + return 100*dvi.dwMajorVersion + dvi.dwMinorVersion; +} + +} // anonymous namespace /* static */ int wxApp::GetComCtl32Version() { -#if defined(__WXMICROWIN__) || defined(__WXWINCE__) - return 0; -#else // cache the result + // + // NB: this is MT-ok as in the worst case we'd compute s_verComCtl32 twice, + // but as its value should be the same both times it doesn't matter static int s_verComCtl32 = -1; - wxCRIT_SECT_DECLARE(csComCtl32); - wxCRIT_SECT_LOCKER(lock, csComCtl32); - if ( s_verComCtl32 == -1 ) { - // initally assume no comctl32.dll at all - s_verComCtl32 = 0; - - // do we have it? - HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32")); - BOOL bFreeComCtl32 = FALSE ; - if(!hModuleComCtl32) + // we're prepared to handle the errors + wxLogNull noLog; + + // 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(_T("comctl32.dll")); + if ( !dllComCtl32.IsLoaded() ) { - hModuleComCtl32 = ::LoadLibrary(wxT("COMCTL32.DLL")) ; - if(hModuleComCtl32) - { - bFreeComCtl32 = TRUE ; - } + s_verComCtl32 = 0; + return 0; } - // if so, then we can check for the version - if ( hModuleComCtl32 ) + // try DllGetVersion() for recent DLLs + s_verComCtl32 = CallDllGetVersion(dllComCtl32); + + // if DllGetVersion() is unavailable either during compile or + // run-time, try to guess the version otherwise + if ( !s_verComCtl32 ) { - // try to use DllGetVersion() if available in _headers_ - WXADLLGETVERSIONPROC pfnDllGetVersion = (WXADLLGETVERSIONPROC) - ::GetProcAddress(hModuleComCtl32, "DllGetVersion"); - if ( pfnDllGetVersion ) + // InitCommonControlsEx is unique to 4.70 and later + void *pfn = dllComCtl32.GetSymbol(_T("InitCommonControlsEx")); + if ( !pfn ) + { + // not found, must be 4.00 + s_verComCtl32 = 400; + } + else // 4.70+ + { + // many symbols appeared in comctl32 4.71, could use any of + // them except may be DllInstall() + pfn = dllComCtl32.GetSymbol(_T("InitializeFlatSB")); + if ( !pfn ) { - WXADLLVERSIONINFO dvi; - dvi.cbSize = sizeof(dvi); - - HRESULT hr = (*pfnDllGetVersion)(&dvi); - if ( FAILED(hr) ) - { - wxLogApiError(_T("DllGetVersion"), hr); - } - else - { - // this is incompatible with _WIN32_IE values, but - // compatible with the other values returned by - // GetComCtl32Version() - s_verComCtl32 = 100*dvi.dwMajorVersion + - dvi.dwMinorVersion; - } + // not found, must be 4.70 + s_verComCtl32 = 470; } - // DllGetVersion() unavailable either during compile or - // run-time, try to guess the version otherwise - if ( !s_verComCtl32 ) + else { - // InitCommonControlsEx is unique to 4.70 and later - FARPROC theProc = ::GetProcAddress - ( - hModuleComCtl32, - "InitCommonControlsEx" - ); - - if ( !theProc ) - { - // not found, must be 4.00 - s_verComCtl32 = 400; - } - else - { - // many symbols appeared in comctl32 4.71, could use - // any of them except may be DllInstall - theProc = ::GetProcAddress - ( - hModuleComCtl32, - "InitializeFlatSB" - ); - if ( !theProc ) - { - // not found, must be 4.70 - s_verComCtl32 = 470; - } - else - { - // found, must be 4.71 - s_verComCtl32 = 471; - } - } + // found, must be 4.71 or later + s_verComCtl32 = 471; } + } } + } + + return s_verComCtl32; +} + +/* static */ +int wxApp::GetShell32Version() +{ + static int s_verShell32 = -1; + if ( s_verShell32 == -1 ) + { + // we're prepared to handle the errors + wxLogNull noLog; - if(bFreeComCtl32) + wxDynamicLibrary dllShell32(_T("shell32.dll"), wxDL_VERBATIM); + if ( dllShell32.IsLoaded() ) { - ::FreeLibrary(hModuleComCtl32) ; + s_verShell32 = CallDllGetVersion(dllShell32); + + if ( !s_verShell32 ) + { + // there doesn't seem to be any way to distinguish between 4.00 + // and 4.70 (starting from 4.71 we have DllGetVersion()) so + // just assume it is 4.0 + s_verShell32 = 400; + } + } + else // failed load the DLL? + { + s_verShell32 = 0; } } - return s_verComCtl32; -#endif + return s_verShell32; } -// Yield to incoming messages +#else // !wxUSE_DYNLIB_CLASS -bool wxApp::Yield(bool onlyIfNeeded) +/* static */ +int wxApp::GetComCtl32Version() { - // MT-FIXME - static bool s_inYield = FALSE; + return 0; +} -#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 +/* static */ +int wxApp::GetShell32Version() +{ + return 0; +} + +#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS + +#endif // !__WXWINCE__ - if ( s_inYield ) +// ---------------------------------------------------------------------------- +// Yield to incoming messages +// ---------------------------------------------------------------------------- + +bool wxApp::Yield(bool onlyIfNeeded) +{ + if ( m_isInsideYield ) { if ( !onlyIfNeeded ) { wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } - s_inYield = TRUE; + // set the flag and don't forget to reset it before returning + m_isInsideYield = true; + wxON_BLOCK_EXIT_SET(m_isInsideYield, 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(); + + // ensure the logs will be flashed again when we exit + wxON_BLOCK_EXIT0(wxLog::Resume); +#endif // wxUSE_LOG + // we don't want to process WM_QUIT from here - it should be processed in // the main event loop in order to stop it + wxEventLoopGuarantor dummyLoopIfNeeded; MSG msg; while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT ) @@ -999,20 +1053,53 @@ bool wxApp::Yield(bool onlyIfNeeded) wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - if ( !wxTheApp->DoMessage() ) + 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 + return true; +} - s_inYield = FALSE; +#if wxUSE_EXCEPTIONS + +// ---------------------------------------------------------------------------- +// exception handling +// ---------------------------------------------------------------------------- - return TRUE; +bool wxApp::OnExceptionInMainLoop() +{ + // ask the user about what to do: use the Win32 API function here as it + // could be dangerous to use any wxWidgets code in this state + switch ( + ::MessageBox + ( + NULL, + _T("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"), + MB_ABORTRETRYIGNORE | + MB_ICONERROR| + MB_TASKMODAL + ) + ) + { + case IDABORT: + throw; + + default: + wxFAIL_MSG( _T("unexpected MessageBox() return code") ); + // fall through + + case IDRETRY: + return false; + + case IDIGNORE: + return true; + } } +#endif // wxUSE_EXCEPTIONS