X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f16fa5265732906b88f2a2fd77326f0b1f54b92a..4a46a5df879c4f820d0a0a435b34c7d5e4793991:/src/mgl/app.cpp diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp index 994448650d..da9471e4dc 100644 --- a/src/mgl/app.cpp +++ b/src/mgl/app.cpp @@ -142,9 +142,13 @@ class wxRootWindow : public wxWindow m_wnd = NULL; } - virtual bool AcceptsFocus() { return FALSE; } + virtual bool AcceptsFocus() const { return FALSE; } + + DECLARE_DYNAMIC_CLASS(wxRootWindow) }; +IMPLEMENT_DYNAMIC_CLASS(wxRootWindow, wxWindow) + static wxRootWindow *gs_rootWindow = NULL; //----------------------------------------------------------------------------- @@ -265,8 +269,9 @@ bool wxApp::OnInitGui() #ifdef __WXDEBUG__ // MGL redirects stdout and stderr to physical console, so lets redirect // it to file. Do it only when WXDEBUG environment variable is set - if ( wxGetEnv(wxT("WXDEBUG"), NULL) ) - freopen("output.err", "wt", stderr); + wxString redirect; + if ( wxGetEnv(wxT("WXSTDERR"), &redirect) ) + freopen(redirect.mb_str(), "wt", stderr); #endif wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui); @@ -539,6 +544,12 @@ void wxEntryCleanup() int wxEntry(int argc, char *argv[]) { +#ifdef __DJGPP__ + // VS: disable long filenames under DJGPP as the very first thing, + // since SciTech MGL doesn't like them much... + wxSetEnv(wxT("LFN"), wxT("N")); +#endif + #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT // This seems to be necessary since there are 'rogue' // objects present at this point (perhaps global objects?)