partially reverted Robert's changes, did it more cleanly

[wxWidgets.git] / src / msw / crashrpt.cpp

diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 26a9abb71137980049c48a6d6591018588cf300f..9ba2dbbb06d53a567c7d48db8c9888f57773038a 100644 (file)
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -58,7 +58,7 @@
 
 #include "wx/datetime.h"
 
-#include "wx/dynload.h"
+#include "wx/dynlib.h"
 
 #include "wx/msw/crashrpt.h"
 
@@ -173,7 +173,7 @@ enum SymbolTag
 // ----------------------------------------------------------------------------
 
 // low level wxBusyCursor replacement: we use Win32 API directly here instead
-// of going through wxWindows calls as this could be dangerous
+// of going through wxWidgets calls as this could be dangerous
 class BusyCursor
 {
 public:
@@ -1089,7 +1089,13 @@ wxString wxCrashReportImpl::GetExceptionString(DWORD dwCode)
 
 #endif // wxUSE_DBGHELP
 
-bool wxCrashReportImpl::Generate(int WXUNUSED(flags))
+bool wxCrashReportImpl::Generate(
+#if wxUSE_DBGHELP
+    int flags
+#else
+    int WXUNUSED(flags)
+#endif
+)
 {
     if ( m_hFile == INVALID_HANDLE_VALUE )
         return false;
@@ -1182,7 +1188,7 @@ bool wxCrashReportImpl::Generate(int WXUNUSED(flags))
             SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME);
 
             // Initialize DbgHelp
-            if ( SymInitialize(GetCurrentProcess(), NULL, TRUE /* invade */) )
+            if ( ::SymInitialize(GetCurrentProcess(), NULL, TRUE /* invade */) )
             {
                 OutputStack(pCtx, flags);
 
@@ -1214,7 +1220,7 @@ bool wxCrashReportImpl::Generate(int WXUNUSED(flags))
 
 #else // !wxUSE_DBGHELP
     Output(_T("Support for crash report generation was not included ")
-           _T("in this wxWindows version."));
+           _T("in this wxWidgets version."));
 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP
 
     return false;