added rtti info (python problem)

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 59e2ef34c69cd746cfb487dd7b389561b702392d..6a20f958789711a428228f3e94e1554b0e9d3301 100644 (file)
--- 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/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()
 
 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()


@@ -53,6 +59,11 @@
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 

+// private functions prototypes
+#ifdef __WXDEBUG__
+    static void LINKAGEMODE SetTraceMasks();
+#endif // __WXDEBUG__
+

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


@@ -63,10 +74,20 @@
 
 wxAppBase::wxAppBase()
 {
 
 wxAppBase::wxAppBase()
 {

+    // this function is defined by IMPLEMENT_APP() macro in the user code
+    extern const wxBuildOptions& wxGetBuildOptions();
+
+    if ( !CheckBuildOptions(wxGetBuildOptions()) )
+    {
+        wxLogFatalError(_T("Mismatch between the program and library build ")
+                        _T("versions detected."));
+    }
+

     wxTheApp = (wxApp *)this;
 
     wxTheApp = (wxApp *)this;
 

-    // VZ: what's this? is it obsolete?
+#if WXWIN_COMPATIBILITY_2_2

     m_wantDebugOutput = FALSE;
     m_wantDebugOutput = FALSE;

+#endif // WXWIN_COMPATIBILITY_2_2

 
 #if wxUSE_GUI
     m_topWindow = (wxWindow *)NULL;
 
 #if wxUSE_GUI
     m_topWindow = (wxWindow *)NULL;


@@ -74,6 +95,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


@@ -82,6 +112,9 @@ bool wxAppBase::OnInitGui()
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
         return FALSE;
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
         return FALSE;

+    wxArtProvider *art = wxTheme::Get()->GetArtProvider();
+    if ( art )
+        wxArtProvider::PushProvider(art);

 #endif // __WXUNIVERSAL__
 
     return TRUE;
 #endif // __WXUNIVERSAL__
 
     return TRUE;


@@ -217,7 +250,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             wxCMD_LINE_SWITCH,
             _T(""),
             OPTION_VERBOSE,
             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
 
         },
 #endif // wxUSE_LOG
 


@@ -227,7 +262,8 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             _T(""),
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             _T(""),
             OPTION_THEME,
             gettext_noop("specify the theme to use"),

-            wxCMD_LINE_VAL_STRING
+            wxCMD_LINE_VAL_STRING,
+            0x0

         },
 #endif // __WXUNIVERSAL__
 
         },
 #endif // __WXUNIVERSAL__
 


@@ -240,12 +276,20 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             _T(""),
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             _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
         },
 #endif // __WXMGL__
 
         // terminator

-        { wxCMD_LINE_NONE }
+        {
+            wxCMD_LINE_NONE,
+            _T(""),
+            _T(""),
+            _T(""),
+            wxCMD_LINE_VAL_NONE,
+            0x0
+        }

     };
 
     parser.SetDesc(cmdLineDesc);
     };
 
     parser.SetDesc(cmdLineDesc);


@@ -316,8 +360,39 @@ bool wxAppBase::OnCmdLineError(wxCmdLineParser& parser)
 // debugging support
 // ----------------------------------------------------------------------------
 
 // 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;
+
+    return wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin);
+
+#undef wxCMP
+}
+

 #ifdef  __WXDEBUG__
 
 #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)
 {
 // wxASSERT() helper
 bool wxAssertIsEqual(int x, int y)
 {