simpler define handling

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 82fdabf78e515d524b6d2dff811f70ae84574831..d3768ba4a7ee108dd891913217d81a5c72156491 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -42,16 +42,6 @@
 #include "wx/vidmode.h"
 #include "wx/evtloop.h"
 
-#ifdef __WXDEBUG__
-    #if wxUSE_STACKWALKER
-        #include "wx/stackwalk.h"
-    #endif // wxUSE_STACKWALKER
-#endif // __WXDEBUG__
-
-#if defined(__WXMSW__)
-    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
-#endif
-
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
@@ -487,8 +477,6 @@ wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
     return NULL;
 }
 
-#ifdef __WXDEBUG__
-
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {
     // under MSW we prefer to use the base class version using ::MessageBox()
@@ -502,6 +490,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 #if defined(__WXMSW__) || defined(__WXDFB__) || !wxUSE_MSGDLG
     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG
+#if wxDEBUG_LEVEL
     wxString msgDlg = msg;
 
 #if wxUSE_STACKWALKER
@@ -534,13 +523,16 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 
         //case wxNO: nothing to do
     }
+#else // !wxDEBUG_LEVEL
+    // this function always exists (for ABI compatibility) but is never called
+    // if debug level is 0 and so can simply do nothing then
+    wxUnusedVar(msg);
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
 
     return false;
 #endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
 }
 
-#endif // __WXDEBUG__
-
 bool wxGUIAppTraitsBase::HasStderr()
 {
     // we consider that under Unix stderr always goes somewhere, even if the