Helpers in disabling warnings for unused params.

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index f06ec4facd39329291c324c230cabf777acda876..e01600229f462f6f2878dcf78f18cfacec18ee86 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -9,6 +9,13 @@
 // License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
+// wxABI_VERSION can be defined when compiling applications but it should be
+// left undefined when compiling the library itself, it is then set to the 
+// library's current version in version.h
+#ifdef wxABI_VERSION
+#error "wxABI_VERSION should not be defined when compiling the library"
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -68,7 +75,7 @@
 #endif // __WXMAC__
 
 #ifdef __WXDEBUG__
-    #ifdef wxUSE_STACKWALKER
+    #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"
         #ifdef __WXMSW__
             #include "wx/msw/debughlp.h"
@@ -142,14 +149,6 @@ wxAppConsole::~wxAppConsole()
 
 bool wxAppConsole::Initialize(int& argc, wxChar **argv)
 {
-#if wxUSE_LOG
-    // If some code logged something before wxApp instance was created,
-    // wxLogStderr was set as the target. Undo it here by destroying the
-    // current target. It will be re-created next time logging is needed, but
-    // this time wxAppTraits will be used:
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
-
     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;
@@ -715,7 +714,7 @@ static wxString GetAssertStackTrace()
 {
     wxString stackTrace;
 
-#ifdef __WXMSW__
+#if wxUSE_DBGHELP
     // check that we can get the stack trace before trying to do it
     if ( !wxDbgHelpDLL::Init() )
         return stackTrace;