Committing in .

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 37b04e0e86b3a7cc4a113129ef435f28c134703e..b1ab25eaf1f87e8d846f24aa3f390b0d8063167d 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -166,7 +166,7 @@ bool wxAppBase::OnInit()
     OnInitCmdLine(parser);
 
     bool cont;
-    switch ( parser.Parse() )
+    switch ( parser.Parse(FALSE /* don't show usage */) )
     {
         case -1:
             cont = OnCmdLineHelp(parser);
@@ -279,14 +279,15 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         unsigned w, h, bpp;
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
-            wxLogError(_("Unsupported display mode '%s'."), themeName.c_str());
+            wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
 
             return FALSE;
         }
 
-        SetDisplayMode(wxDisplayModeInfo(wxSize(w, h), bpp));
+        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
+            return FALSE;
     }
-#endif
+#endif // __WXMGL__
 
     return TRUE;
 }
@@ -324,7 +325,7 @@ void wxTrap()
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     DebugBreak();
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
 #if __powerc
     Debugger();
 #else