Made ico files binary

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index c2c7b05bf7ac593cb7e49063394e92a4eeda92b1..b333b2fc6caed07cbfd445dcefa523effd9014b5 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -68,7 +68,7 @@
 #endif // __WXMAC__
 
 #ifdef __WXDEBUG__
-    #ifdef wxUSE_STACKWALKER
+    #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"
         #ifdef __WXMSW__
             #include "wx/msw/debughlp.h"
@@ -710,14 +710,17 @@ bool DoShowAssertDialog(const wxString& msg)
     return false;
 }
 
+#if wxUSE_STACKWALKER
 static wxString GetAssertStackTrace()
 {
     wxString stackTrace;
 
+#if wxUSE_DBGHELP
     // check that we can get the stack trace before trying to do it
     if ( !wxDbgHelpDLL::Init() )
         return stackTrace;
-
+#endif
+    
     class StackDump : public wxStackWalker
     {
     public:
@@ -773,6 +776,7 @@ static wxString GetAssertStackTrace()
 
     return stackTrace;
 }
+#endif // wxUSE_STACKWALKER
 
 // show the assert modal dialog
 static