fixed crash in iconv_close() as well

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 49c21fe4693de9d9a9eb7c003f9c412f90ddbbfa..c3461c2934a2abb6f8f375761eff03bd4fb14f7f 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -49,6 +49,10 @@
   #include  "wx/msw/private.h"  // includes windows.h for MessageBox()
 #endif
 
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -72,6 +76,11 @@ wxAppBase::wxAppBase()
 #endif // wxUSE_GUI
 }
 
+wxAppBase::~wxAppBase()
+{
+    // this destructor is required for Darwin
+}
+
 #if wxUSE_GUI
 bool wxAppBase::OnInitGui()
 {
@@ -166,7 +175,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 +293,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;
 }