extended display mode handling to accept WXMODE env. variable

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index d40b8d7062266e2e6562d08b9942ccbfa621da9b..4ff72018bc2f087c967f0af99b53449b17277717 100644 (file)
--- 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() )
 bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
 {
     if ( !mode.IsOk() )

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 217508e3258db29a9444a5db9e276e1c0db0e95e..f749bc125181cde32ea47f17a9c967588befa15e 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -469,12 +469,14 @@ END_EVENT_TABLE()
 // constructors and such
 // ----------------------------------------------------------------------------
 
 // constructors and such
 // ----------------------------------------------------------------------------
 

+extern wxDisplayModeInfo wxGetDefaultDisplayMode();
+

 void wxWindowMGL::Init()
 {
     // First of all, make sure window manager is up and running. If it is
     // not the case, initialize it in default display mode
     if ( !g_winMng )
 void wxWindowMGL::Init()
 {
     // First of all, make sure window manager is up and running. If it is
     // not the case, initialize it in default display mode
     if ( !g_winMng )

-        wxTheApp->SetDisplayMode(wxDisplayModeInfo(640, 480, 16));
+        wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode());

 
     // generic:
     InitBase();
 
     // generic:
     InitBase();