/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name: src/msw/app.cpp
// Purpose: wxApp
// Author: Julian Smart
// Modified by:
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "app.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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"
#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/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/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/ole/oleutils.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#define wxUSE_OLE 0
#endif // broken compilers
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+ #include <ole2.h>
+ #include <aygshell.h>
+#endif
+
#if wxUSE_OLE
#include <ole2.h>
#endif
#include <string.h>
#include <ctype.h>
-#include "wx/msw/wrapcctl.h"
-
-#if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
- !defined(__CYGWIN__) && !defined(__WXWINCE__) && \
- (!defined(_MSC_VER) || (_MSC_VER > 1100))
- #include <shlwapi.h>
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
#endif
+// instead of including <shlwapi.h> 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
+//
+// 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)
+
+
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
-extern wxList WXDLLEXPORT wxPendingDelete;
-
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
extern void wxSetKeyboardHook(bool doIt);
#endif
-MSG s_currentMsg;
-
// 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");
-
-HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
+#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");
// ----------------------------------------------------------------------------
// private functions
{
wxEndBusyCursor();
- const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
+ ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
delete data->wd;
// 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
+ wxEventLoop *evtLoop = wxEventLoop::GetActive();
+ if ( !evtLoop || !evtLoop->Pending() )
+ {
+ // no events means no quit event
+ return true;
+ }
+
+ return evtLoop->Dispatch();
}
-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
{
- static wxToolkitInfo info;
- wxToolkitInfo& baseInfo = wxAppTraits::GetToolkitInfo();
- info.versionMajor = baseInfo.versionMajor;
- info.versionMinor = baseInfo.versionMinor;
- info.os = baseInfo.os;
- info.shortName = _T("msw");
- info.name = _T("wxMSW");
-#ifdef __WXUNIVERSAL__
- info.shortName << _T("univ");
- info.name << _T("/wxUniversal");
+ 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
- return info;
}
// ===========================================================================
// ensure that base cleanup is done if we return too early
wxCallBaseCleanup callBaseCleanup(this);
- // 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 )
+#ifdef __WXWINCE__
+ wxString tmp = GetAppName();
+ tmp += wxT("ClassName");
+ wxCanvasClassName = wxStrdup( tmp.c_str() );
+ tmp += wxT("NR");
+ wxCanvasClassNameNR = wxStrdup( tmp.c_str() );
+ HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL );
+ if (hWnd)
{
- // 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;
+ SetForegroundWindow( (HWND)(((DWORD)hWnd)|0x01) );
+ return false;
}
-#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
+#endif
-#if defined(__WIN95__) && !defined(__WXMICROWIN__)
+#if !defined(__WXMICROWIN__)
InitCommonControls();
-#endif // __WIN95__
-
-#if wxUSE_OLE || wxUSE_DRAG_AND_DROP
+#endif // !defined(__WXMICROWIN__)
-#ifdef __WIN16__
- // for OLE, enlarge message queue to be as large as possible
- int iMsg = 96;
- while (!SetMessageQueue(iMsg) && (iMsg -= 8))
- ;
-#endif // Win16
-
-#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"));
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+ SHInitExtraControls();
#endif
-#endif
-
-#endif // wxUSE_OLE
-#if wxUSE_CTL3D
- if (!Ctl3dRegister(wxhInstance))
- wxLogError(wxT("Cannot register CTL3D"));
+#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
- Ctl3dAutoSubclass(wxhInstance);
-#endif // wxUSE_CTL3D
+ wxOleInitialize();
RegisterWindowClasses();
-#if defined(__WXMICROWIN__) && !defined(__WXWINCE__)
- // Create the brush for disabling bitmap buttons
-
- 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
-
-#if wxUSE_PENWINDOWS
- wxRegisterPenWin();
-#endif
-
wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
- // 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
-
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
- wxSetKeyboardHook(TRUE);
+ wxSetKeyboardHook(true);
#endif
callBaseCleanup.Dismiss();
wndclass.hInstance = wxhInstance;
wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
- // Register the frame window class.
- wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
+ // register the class for all normal windows
+ wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
wndclass.lpszClassName = wxCanvasClassName;
wndclass.style = styleNormal;
wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
}
- return TRUE;
+ return true;
}
// ---------------------------------------------------------------------------
bool wxApp::UnregisterWindowClasses()
{
- bool retval = TRUE;
+ bool retval = true;
#ifndef __WXMICROWIN__
// MDI frame window class.
{
wxLogLastError(wxT("UnregisterClass(MDI parent)"));
- retval = FALSE;
+ retval = false;
}
// "no redraw" MDI frame
{
wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
- retval = FALSE;
+ retval = false;
}
// MDI child frame window class.
{
wxLogLastError(wxT("UnregisterClass(MDI child)"));
- retval = FALSE;
+ retval = false;
}
// "no redraw" MDI child frame
{
wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
- retval = FALSE;
+ retval = false;
}
// canvas class name
{
wxLogLastError(wxT("UnregisterClass(canvas)"));
- retval = FALSE;
+ retval = false;
}
if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
{
wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
- retval = FALSE;
+ retval = false;
}
#endif // __WXMICROWIN__
void wxApp::CleanUp()
{
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
- wxSetKeyboardHook(FALSE);
-#endif
+ // 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
+ wxAppBase::CleanUp();
-#if wxUSE_PENWINDOWS
- wxCleanUpPenWin();
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ wxSetKeyboardHook(false);
#endif
- if ( wxDisableButtonBrush )
- ::DeleteObject( wxDisableButtonBrush );
-
-#if wxUSE_OLE
-#ifdef __WXWINCE__
- ::CoUninitialize();
-#else
- ::OleUninitialize();
-#endif
-#endif
+ wxOleUninitialize();
// 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
// unregister the classes now
UnregisterWindowClasses();
-#if wxUSE_CTL3D
- Ctl3dUnregister(wxhInstance);
-#endif
-
delete wxWinHandleHash;
wxWinHandleHash = NULL;
- wxAppBase::CleanUp();
+#ifdef __WXWINCE__
+ free( wxCanvasClassName );
+ free( wxCanvasClassNameNR );
+#endif
}
// ----------------------------------------------------------------------------
wxApp::~wxApp()
{
- // 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]);
- }
-
- // but m_argv itself -- using new[]
- delete [] argv;
}
-bool wxApp::Initialized()
-{
-#ifndef _WINDLL
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
-#else // Assume initialized if DLL (no way of telling)
- return TRUE;
-#endif
-}
-
-/*
- * 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 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 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;
-
- // 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);
- }
-
- 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;
-
- size_t count = s_aSavedMessages.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- MSG& msg = s_aSavedMessages[n];
-
- DoMessage((WXMSG *)&msg);
- }
-
- s_aSavedMessages.Empty();
- }
- }
-#endif // wxUSE_THREADS
-
- // Process the message
- DoMessage((WXMSG *)&s_currentMsg);
- }
-
- return TRUE;
-}
-
-void wxApp::DoMessage(WXMSG *pMsg)
-{
- if ( !ProcessMessage(pMsg) )
- {
- ::TranslateMessage((MSG *)pMsg);
- ::DispatchMessage((MSG *)pMsg);
- }
-}
-
-/*
- * 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;
-
- while ( m_keepGoing )
- {
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-
- while ( !Pending() && ProcessIdle() )
- ;
-
- // a message came or no more idle processing to do
- DoMessage();
- }
-
- return s_currentMsg.wParam;
-}
-
-void wxApp::ExitMainLoop()
-{
- // this will set m_keepGoing to FALSE a bit later
- ::PostQuitMessage(0);
-}
-
-bool wxApp::Pending()
-{
- return ::PeekMessage(&s_currentMsg, 0, 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 *wxmsg)
-{
- 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 )
- {
- // 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 )
- {
- hwnd = ::GetParent(hwnd);
- }
-
- 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 )
- {
- tt->RelayEvent(wxmsg);
- }
- }
-#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;
-
- for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
- {
- if ( wnd->MSWTranslateMessage(wxmsg))
- return TRUE;
-
- // 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;
- }
-
- // 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;
- }
-
- // no special preprocessing for this message, dispatch it normally
- return FALSE;
-}
-
-// 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 idle handling
+// ----------------------------------------------------------------------------
void wxApp::OnIdle(wxIdleEvent& event)
{
- // Avoid recursion (via ProcessEvent default case)
- if ( wxIsInOnIdleFlag )
- return;
-
- wxIsInOnIdleFlag = TRUE;
-
wxAppBase::OnIdle(event);
#if wxUSE_DC_CACHEING
if (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON))
wxDC::ClearCache();
#endif // wxUSE_DC_CACHEING
-
- wxIsInOnIdleFlag = FALSE;
}
void wxApp::WakeUpIdle()
}
}
+// ----------------------------------------------------------------------------
+// other wxApp event hanlders
+// ----------------------------------------------------------------------------
+
void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
{
if (GetTopWindow())
- GetTopWindow()->Close(TRUE);
+ GetTopWindow()->Close(true);
}
// Default behaviour: close the application with prompts. The
if (GetTopWindow())
{
if (!GetTopWindow()->Close(!event.CanVeto()))
- event.Veto(TRUE);
+ event.Veto(true);
}
}
+// ----------------------------------------------------------------------------
+// miscellaneous
+// ----------------------------------------------------------------------------
+
/* static */
int wxApp::GetComCtl32Version()
{
// we're prepared to handle the errors
wxLogNull noLog;
+#if wxUSE_DYNLIB_CLASS
// do we have it?
wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
// if so, then we can check for the version
if ( dllComCtl32.IsLoaded() )
{
- // try to use DllGetVersion() if available in _headers_
+ // now check if the function is available during run-time
wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
if ( pfnDllGetVersion )
{
}
}
}
+#endif
}
return s_verComCtl32;
bool wxApp::Yield(bool onlyIfNeeded)
{
// MT-FIXME
- static bool s_inYield = FALSE;
+ static bool s_inYield = false;
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
wxFAIL_MSG( wxT("wxYield called recursively" ) );
}
- return FALSE;
+ return false;
}
- s_inYield = TRUE;
+ 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
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
- if ( !wxTheApp->DoMessage() )
+ if ( !wxTheApp->Dispatch() )
break;
}
wxLog::Resume();
#endif // wxUSE_LOG
- s_inYield = FALSE;
+ s_inYield = false;
+
+ return true;
+}
+
+#if wxUSE_EXCEPTIONS
+
+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+
+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
- return TRUE;
+// ----------------------------------------------------------------------------
+// deprecated event loop functions
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxApp::DoMessage(WXMSG *pMsg)
+{
+ wxEventLoop *evtLoop = wxEventLoop::GetActive();
+ if ( evtLoop )
+ evtLoop->ProcessMessage(pMsg);
+}
+
+bool wxApp::DoMessage()
+{
+ wxEventLoop *evtLoop = wxEventLoop::GetActive();
+ return evtLoop ? evtLoop->Dispatch() : false;
+}
+
+bool wxApp::ProcessMessage(WXMSG* pMsg)
+{
+ wxEventLoop *evtLoop = wxEventLoop::GetActive();
+ return evtLoop && evtLoop->PreProcessMessage(pMsg);
}
+#endif // WXWIN_COMPATIBILITY_2_4
projects / wxWidgets.git / blobdiff