changes to match listctrl.h changes (forgot to commit yesterday, sorry)

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 37b04e0e86b3a7cc4a113129ef435f28c134703e..ce42b0dd1fff6c405027dc07630e39fb3565114a 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -279,12 +279,13 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         unsigned w, h, bpp;
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
         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;
         }
 
 
             return FALSE;
         }
 

-        SetDisplayMode(wxDisplayModeInfo(wxSize(w, h), bpp));
+        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
+            return FALSE;

     }
 #endif
 
     }
 #endif
 


@@ -324,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