X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49e885f80715560a88d0f7eccbb497ec8c3c1641..3f1d13738e83009afd3c2058757cefa28d709598:/src/common/appcmn.cpp?ds=sidebyside

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index af586d4f31..b1ab25eaf1 100644
--- 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);
@@ -284,10 +284,10 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
             return FALSE;
         }
 
-        if ( !SetDisplayMode(wxDisplayModeInfo(wxSize(w, h), bpp)) )
+        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
             return FALSE;
     }
-#endif
+#endif // __WXMGL__
 
     return TRUE;
 }
@@ -325,7 +325,7 @@ void wxTrap()
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     DebugBreak();
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
 #if __powerc
     Debugger();
 #else