X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c31ad41d80a54677b6a3100b77b9747f6bad7d65..e83ecba968c94965523be449a56fffcf4c55010b:/src/common/appcmn.cpp?ds=sidebyside

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 49c21fe469..3e0ecff929 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -40,6 +40,12 @@
 #include "wx/cmdline.h"
 #include "wx/thread.h"
 #include "wx/confbase.h"
+#include "wx/tokenzr.h"
+#include "wx/utils.h"
+
+#if wxUSE_GUI
+    #include "wx/artprov.h"
+#endif // wxUSE_GUI
 
 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
@@ -49,6 +55,15 @@
   #include  "wx/msw/private.h"  // includes windows.h for MessageBox()
 #endif
 
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+// private functions prototypes
+#ifdef __WXDEBUG__
+    static void LINKAGEMODE SetTraceMasks();
+#endif // __WXDEBUG__
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -61,8 +76,9 @@ wxAppBase::wxAppBase()
 {
     wxTheApp = (wxApp *)this;
 
-    // VZ: what's this? is it obsolete?
+#if WXWIN_COMPATIBILITY_2_2
     m_wantDebugOutput = FALSE;
+#endif // WXWIN_COMPATIBILITY_2_2
 
 #if wxUSE_GUI
     m_topWindow = (wxWindow *)NULL;
@@ -70,6 +86,15 @@ wxAppBase::wxAppBase()
     m_exitOnFrameDelete = TRUE;
     m_isActive = TRUE;
 #endif // wxUSE_GUI
+
+#ifdef __WXDEBUG__
+    SetTraceMasks();
+#endif
+}
+
+wxAppBase::~wxAppBase()
+{
+    // this destructor is required for Darwin
 }
 
 #if wxUSE_GUI
@@ -78,6 +103,9 @@ bool wxAppBase::OnInitGui()
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
         return FALSE;
+    wxArtProvider *art = wxTheme::Get()->GetArtProvider();
+    if ( art )
+        wxArtProvider::PushProvider(art);
 #endif // __WXUNIVERSAL__
 
     return TRUE;
@@ -154,6 +182,12 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
 
 #endif // wxUSE_GUI
 
+int wxAppBase::FilterEvent(wxEvent& WXUNUSED(event))
+{
+    // process the events normally by default
+    return -1;
+}
+
 // ----------------------------------------------------------------------------
 // cmd line parsing
 // ----------------------------------------------------------------------------
@@ -166,7 +200,7 @@ bool wxAppBase::OnInit()
     OnInitCmdLine(parser);
 
     bool cont;
-    switch ( parser.Parse() )
+    switch ( parser.Parse(FALSE /* don't show usage */) )
     {
         case -1:
             cont = OnCmdLineHelp(parser);
@@ -213,7 +247,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             wxCMD_LINE_SWITCH,
             _T(""),
             OPTION_VERBOSE,
-            gettext_noop("generate verbose log messages")
+            gettext_noop("generate verbose log messages"),
+            wxCMD_LINE_VAL_NONE,
+            0x0
         },
 #endif // wxUSE_LOG
 
@@ -223,7 +259,8 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             _T(""),
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
-            wxCMD_LINE_VAL_STRING
+            wxCMD_LINE_VAL_STRING,
+            0x0
         },
 #endif // __WXUNIVERSAL__
 
@@ -236,12 +273,20 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             _T(""),
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
-            wxCMD_LINE_VAL_STRING
+            wxCMD_LINE_VAL_STRING,
+            0x0
         },
 #endif // __WXMGL__
 
         // terminator
-        { wxCMD_LINE_NONE }
+        {
+            wxCMD_LINE_NONE,
+            _T(""),
+            _T(""),
+            _T(""),
+            wxCMD_LINE_VAL_NONE,
+            0x0
+        }
     };
 
     parser.SetDesc(cmdLineDesc);
@@ -284,10 +329,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;
 }
@@ -312,8 +357,47 @@ bool wxAppBase::OnCmdLineError(wxCmdLineParser& parser)
 // debugging support
 // ----------------------------------------------------------------------------
 
+/* static */
+bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
+{
+#define wxCMP(what)   (what == opts.m_ ## what)
+
+    bool
+#ifdef __WXDEBUG__
+    isDebug = TRUE;
+#else
+    isDebug = FALSE;
+#endif
+
+    int verMaj = wxMAJOR_VERSION,
+        verMin = wxMINOR_VERSION;
+
+    if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
+    {
+        wxLogFatalError(_T("Mismatch between the program and library build ")
+                        _T("versions detected."));
+
+        // normally wxLogFatalError doesn't return
+        return FALSE;
+    }
+#undef wxCMP
+
+    return TRUE;
+}
+
 #ifdef  __WXDEBUG__
 
+static void LINKAGEMODE SetTraceMasks()
+{
+    wxString mask;
+    if ( wxGetEnv(wxT("WXTRACE"), &mask) )
+    {
+        wxStringTokenizer tkn(mask, wxT(","));
+        while ( tkn.HasMoreTokens() )
+            wxLog::AddTraceMask(tkn.GetNextToken());
+    }
+}
+
 // wxASSERT() helper
 bool wxAssertIsEqual(int x, int y)
 {