// ---------------------------------------------------------------------------
extern wxChar *wxBuffer;
-extern wxChar *wxOsVersion;
extern wxList *wxWinHandleList;
extern wxList WXDLLEXPORT wxPendingDelete;
extern void wxSetKeyboardHook(bool doIt);
// FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
// needs compiler support for Win32 SEH. Others (especially Borland)
// probably have it too, but I'm not sure about how it works
-#ifndef __VISUALC__
+// JACS: get 'Cannot use __try in functions that require unwinding
+// in Unicode mode, so disabling.
+#if !defined(__VISUALC__) || defined(__WIN16__) || defined(UNICODE)
#undef wxUSE_ON_FATAL_EXCEPTION
#define wxUSE_ON_FATAL_EXCEPTION 0
#endif // VC++
// wxApp
// ---------------------------------------------------------------------------
- IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
- BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
- EVT_END_SESSION(wxApp::OnEndSession)
- EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
- END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+ EVT_IDLE(wxApp::OnIdle)
+ EVT_END_SESSION(wxApp::OnEndSession)
+ EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
+END_EVENT_TABLE()
//// Initialize
bool wxApp::Initialize()
{
+ // the first thing to do is to check if we're trying to run an Unicode
+ // program under Win9x - if so, abort right now as it has no chance to
+ // work
+#if wxUSE_UNICODE
+ if ( wxGetOsVersion() != wxWINDOWS_NT )
+ {
+ // 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.\nProgram aborted."),
+ _T("wxWindows Fatal Error"),
+ MB_ICONERROR | MB_OK
+ );
+
+ return FALSE;
+ }
+#endif // wxUSE_UNICODE
+
// Some people may wish to use this, but
// probably it shouldn't be here by default.
#ifdef __WXDEBUG__
wxClassInfo::InitializeClasses();
-#if wxUSE_RESOURCES
- wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
-#endif
-
#if wxUSE_THREADS
wxPendingEventsLocker = new wxCriticalSection;
#endif
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(frame)");
+ wxLogLastError(wxT("RegisterClass(frame)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw frame)");
+ wxLogLastError(wxT("RegisterClass(no redraw frame)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(MDI parent)");
+ wxLogLastError(wxT("RegisterClass(MDI parent)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw MDI parent frame)");
+ wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(MDI child)");
+ wxLogLastError(wxT("RegisterClass(MDI child)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw MDI child)");
+ wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(panel)");
+ wxLogLastError(wxT("RegisterClass(panel)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw panel)");
+ wxLogLastError(wxT("RegisterClass(no redraw panel)"));
return FALSE;
}
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(canvas)");
+ wxLogLastError(wxT("RegisterClass(canvas)"));
return FALSE;
}
wndclass.style = styleNoRedraw;
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw canvas)");
+ wxLogLastError(wxT("RegisterClass(no redraw canvas)"));
return FALSE;
}
// Entry point helpers, used by wxPython
//----------------------------------------------------------------------
-int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
+int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
{
return wxApp::Initialize();
}
-int WXDLLEXPORT wxEntryInitGui()
+int WXDLLEXPORT wxEntryInitGui()
{
wxTheApp->OnInitGui();
return 0;
int retValue = 0;
- if ( wxTheApp->OnInit() )
+ // it is common to create a modal dialog in OnInit() (to ask/notify the
+ // user about something) but it wouldn't work if we don't change the
+ // "exit on delete last frame" flag here as when this dialog is
+ // deleted, the app would terminate (it was the last top level window
+ // as the main frame wasn't created yet!), so disable this behaviour
+ // temproarily
+ bool exitOnLastFrameDelete = wxTheApp->GetExitOnFrameDelete();
+ wxTheApp->SetExitOnFrameDelete(FALSE);
+
+ // init the app
+ retValue = wxTheApp->OnInit() ? 0 : -1;
+
+ // restore the old flag value
+ wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);
+
+ if ( retValue == 0 )
{
if ( enterLoop )
{
+ // run the main loop
retValue = wxTheApp->OnRun();
}
else
- // We want to initialize, but not run or exit immediately.
+ {
+ // we want to initialize, but not run or exit immediately.
return 1;
+ }
}
//else: app initialization failed, so we skipped OnRun()
__except ( gs_handleExceptions ? EXCEPTION_EXECUTE_HANDLER
: EXCEPTION_CONTINUE_SEARCH ) {
if ( wxTheApp )
+ {
+ // give the user a chance to do something special about this
wxTheApp->OnFatalException();
-
- // using wxLog would be unsafe here
- ::MessageBox(NULL,
- _("Unrecoverable program error detected: "
- " the application will terminate."),
- _("Fatal Error"),
- MB_APPLMODAL | MB_ICONSTOP | MB_OK);
+ }
::ExitProcess(3); // the same exit code as abort()
else if ( rc == -1 )
{
// should never happen, but let's test for it nevertheless
- wxLogLastError("GetMessage");
+ wxLogLastError(wxT("GetMessage"));
}
else
{
// Try translations first; find the youngest window with
// a translation table.
wxWindow *wnd;
+
for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
{
if ( wnd->MSWTranslateMessage(wxmsg) )
// try to use DllGetVersion() if available in _headers_
#ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h
DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC)
- ::GetProcAddress(hModuleComCtl32, _T("DllGetVersion"));
+ ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
if ( pfnDllGetVersion )
{
DLLVERSIONINFO dvi;
FARPROC theProc = ::GetProcAddress
(
hModuleComCtl32,
-#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520)
"InitCommonControlsEx"
-#else
- _T("InitCommonControlsEx")
-#endif
);
if ( !theProc )
theProc = ::GetProcAddress
(
hModuleComCtl32,
-#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520)
"InitializeFlatSB"
-#else
- _T("InitializeFlatSB")
-#endif
);
if ( !theProc )
{
}
// Yield to incoming messages
+
+static bool gs_inYield = FALSE;
+
bool wxYield()
{
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
+#ifdef __WXDEBUG__
+ if (gs_inYield)
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+#endif
+
+ gs_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;
// let the logs be flashed again
wxLog::Resume();
+ gs_inYield = FALSE;
+
return TRUE;
}
+// Yield to incoming messages; but fail silently if recursion is detected.
+bool wxYieldIfNeeded()
+{
+ if (gs_inYield)
+ return FALSE;
+
+ return wxYield();
+}
+
bool wxHandleFatalExceptions(bool doit)
{
#if wxUSE_ON_FATAL_EXCEPTION
if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) )
{
// should never happen
- wxLogLastError("PostMessage(WM_NULL)");
+ wxLogLastError(wxT("PostMessage(WM_NULL)"));
}
}
}
projects / wxWidgets.git / blobdiff