X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df16a53ef9ae506c51023178e4fe45ce45e69447..2aa607286c86f91bd8af9ac2d6287ba01521107c:/src/mgl/app.cpp

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index d40b8d7062..a542b5c24f 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -220,6 +220,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() )
@@ -397,8 +411,6 @@ bool wxApp::Initialize()
 
     wxClassInfo::InitializeClasses();
 
-    wxSystemSettings::Init();
-    
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
@@ -472,8 +484,6 @@ void wxApp::CleanUp()
     delete wxPendingEventsLocker;
 #endif
 
-    wxSystemSettings::Done();
-
     wxClassInfo::CleanUpClasses();
 
     // Can't do this in wxModule, because fonts are needed by stock lists
@@ -529,6 +539,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?)