X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05c9ccbe622515f0c32c996a95e86a316b13a59b..578dc95029e761a59911b7c1bc09f59384d64ddf:/src/mgl/app.cpp

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 9112462198..82261a7938 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -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;
 
 //-----------------------------------------------------------------------------
@@ -220,6 +224,20 @@ wxApp::~wxApp()
 {
 }
 
+wxDisplayModeInfo wxGetDefaultDisplayMode()
+{
+    wxString mode;
+    unsigned w, h, bpp;
+
+    if ( !wxGetEnv(wxT("WXMODE"), &mode) || 
+         (wxSscanf(mode.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3) )
+    {
+        w = 640, h = 480, bpp = 16;
+    }
+
+    return wxDisplayModeInfo(w, h, bpp);
+}
+
 bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
 {
     if ( !mode.IsOk() )
@@ -251,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);
@@ -391,14 +410,13 @@ void wxApp::DeletePendingObjects()
 bool wxApp::Initialize()
 {
     if ( MGL_init(".", NULL) == 0 )
+    {
+        wxLogError(_("Cannot initialize SciTech MGL!"));
         return FALSE;
-
-    wxBuffer = new wxChar[BUFSIZ + 512];
+    }
 
     wxClassInfo::InitializeClasses();
 
-    wxSystemSettings::Init();
-    
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
@@ -429,11 +447,6 @@ bool wxApp::Initialize()
     return TRUE;
 }
 
-wxIcon wxApp::GetStdIcon(int which) const
-{
-    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
-}
-
 void wxApp::CleanUp()
 {
 #if wxUSE_LOG
@@ -461,13 +474,10 @@ void wxApp::CleanUp()
     wxDeleteStockObjects();
     wxDeleteStockLists();
 
-    // Can't do this in wxModule, because fonts are needed by stock lists
-    delete wxTheFontsManager;
-    wxTheFontsManager = (wxFontsManager*) NULL;
-
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
+
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
 #if wxUSE_THREADS
@@ -475,12 +485,14 @@ void wxApp::CleanUp()
     delete wxPendingEventsLocker;
 #endif
 
-    wxSystemSettings::Done();
-
-    delete[] wxBuffer;
-
     wxClassInfo::CleanUpClasses();
 
+    // Can't do this in wxModule, because fonts are needed by stock lists
+    // (do it after deleting wxTheApp and cleaning modules up, since somebody
+    // may be deleting fonts that lately)
+    delete wxTheFontsManager;
+    wxTheFontsManager = (wxFontsManager*) NULL;
+
     // check for memory leaks
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
@@ -526,6 +538,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?)