reverted the previous fix, it's no longer needed now after the change to the default...

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 608a40ea4e023baa1930d4ba6fd262d222963da2..6795eec0c41d20ccd7c6ece181ca04efd15cb807 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -40,6 +40,8 @@
 #include "wx/cmdline.h"
 #include "wx/thread.h"
 #include "wx/confbase.h"
 #include "wx/cmdline.h"
 #include "wx/thread.h"
 #include "wx/confbase.h"

+#include "wx/tokenzr.h"
+#include "wx/utils.h"

 
 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 
 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()


@@ -49,6 +51,10 @@
   #include  "wx/msw/private.h"  // includes windows.h for MessageBox()
 #endif
 
   #include  "wx/msw/private.h"  // includes windows.h for MessageBox()
 #endif
 

+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+

 // ===========================================================================
 // implementation
 // ===========================================================================
 // ===========================================================================
 // implementation
 // ===========================================================================


@@ -57,6 +63,19 @@
 // initialization and termination
 // ----------------------------------------------------------------------------
 
 // initialization and termination
 // ----------------------------------------------------------------------------
 

+#ifdef __WXDEBUG__
+static void LINKAGEMODE SetTraceMasks()
+{
+    wxString mask;
+    if ( wxGetEnv(wxT("WXTRACE"), &mask) )
+    {
+        wxStringTokenizer tkn(mask, wxT(","));
+        while ( tkn.HasMoreTokens() )
+            wxLog::AddTraceMask(tkn.GetNextToken());
+    }
+}
+#endif
+

 wxAppBase::wxAppBase()
 {
     wxTheApp = (wxApp *)this;
 wxAppBase::wxAppBase()
 {
     wxTheApp = (wxApp *)this;


@@ -70,6 +89,15 @@ wxAppBase::wxAppBase()
     m_exitOnFrameDelete = TRUE;
     m_isActive = TRUE;
 #endif // wxUSE_GUI
     m_exitOnFrameDelete = TRUE;
     m_isActive = TRUE;
 #endif // wxUSE_GUI

+
+#ifdef __WXDEBUG__
+    SetTraceMasks();
+#endif
+}
+
+wxAppBase::~wxAppBase()
+{
+    // this destructor is required for Darwin

 }
 
 #if wxUSE_GUI
 }
 
 #if wxUSE_GUI


@@ -166,7 +194,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 +220,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 +255,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 +300,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 +353,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


@@ -313,19 +372,6 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;
 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;

-    static bool s_bInAssert = FALSE;        // FIXME MT-unsafe
-
-    if ( s_bInAssert )
-    {
-        // He-e-e-e-elp!! we're trapped in endless loop
-        wxTrap();
-
-        s_bInAssert = FALSE;
-
-        return;
-    }
-
-    s_bInAssert = TRUE;

 
     wxChar szBuf[4096];
 
 
     wxChar szBuf[4096];
 


@@ -396,13 +442,26 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
         wxTrap();
 #endif // GUI/!GUI
     }
         wxTrap();
 #endif // GUI/!GUI
     }

-
-    s_bInAssert = FALSE;

 }
 
 // this function is called when an assert fails
 void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {
 }
 
 // this function is called when an assert fails
 void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {

+    // FIXME MT-unsafe
+    static bool s_bInAssert = FALSE;
+
+    if ( s_bInAssert )
+    {
+        // He-e-e-e-elp!! we're trapped in endless loop
+        wxTrap();
+
+        s_bInAssert = FALSE;
+
+        return;
+    }
+
+    s_bInAssert = TRUE;
+

     if ( !wxTheApp )
     {
         // by default, show the assert dialog box - we can't customize this
     if ( !wxTheApp )
     {
         // by default, show the assert dialog box - we can't customize this


@@ -414,6 +473,8 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         // let the app process it as it wants
         wxTheApp->OnAssert(szFile, nLine, szMsg);
     }
         // let the app process it as it wants
         wxTheApp->OnAssert(szFile, nLine, szMsg);
     }

+
+    s_bInAssert = FALSE;

 }
 
 void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg)
 }
 
 void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg)