PyCrust updates

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 84f193af6271dd38b22cd4d068b091b27b44b3c6..b1ab25eaf1f87e8d846f24aa3f390b0d8063167d 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -166,7 +166,7 @@ bool wxAppBase::OnInit()
     OnInitCmdLine(parser);
 
     bool cont;
     OnInitCmdLine(parser);
 
     bool cont;

-    switch ( parser.Parse() )
+    switch ( parser.Parse(FALSE /* don't show usage */) )

     {
         case -1:
             cont = OnCmdLineHelp(parser);
     {
         case -1:
             cont = OnCmdLineHelp(parser);


@@ -192,6 +192,7 @@ bool wxAppBase::OnInit()
 
 #define OPTION_VERBOSE _T("verbose")
 #define OPTION_THEME   _T("theme")
 
 #define OPTION_VERBOSE _T("verbose")
 #define OPTION_THEME   _T("theme")

+#define OPTION_MODE    _T("mode")

 
 void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 {
 
 void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 {


@@ -226,6 +227,19 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         },
 #endif // __WXUNIVERSAL__
 
         },
 #endif // __WXUNIVERSAL__
 

+#if defined(__WXMGL__)
+        // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
+        //     should provide this option. That's why it is in common/appcmn.cpp
+        //     and not mgl/app.cpp
+        {
+            wxCMD_LINE_OPTION,
+            _T(""),
+            OPTION_MODE,
+            gettext_noop("specify display mode to use (e.g. 640x480-16)"),
+            wxCMD_LINE_VAL_STRING
+        },
+#endif // __WXMGL__
+

         // terminator
         { wxCMD_LINE_NONE }
     };
         // terminator
         { wxCMD_LINE_NONE }
     };


@@ -258,6 +272,23 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
     }
 #endif // __WXUNIVERSAL__
 
     }
 #endif // __WXUNIVERSAL__
 

+#if defined(__WXMGL__)
+    wxString modeDesc;
+    if ( parser.Found(OPTION_MODE, &modeDesc) )
+    {
+        unsigned w, h, bpp;
+        if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
+        {
+            wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
+
+            return FALSE;
+        }
+
+        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
+            return FALSE;
+    }
+#endif // __WXMGL__
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -294,7 +325,7 @@ void wxTrap()
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     DebugBreak();
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     DebugBreak();

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

 #if __powerc
     Debugger();
 #else
 #if __powerc
     Debugger();
 #else