Renamed m_clientData member variable to avoid clash with variable with same

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

diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index f67b384083d16ab3c03a5cf5f99c1467b8939b52..8bdf7d4021931971216fa80aa6796d9fe01014d8 100644 (file)
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -128,15 +128,15 @@ wxStackFrame::GetParam(size_t n,
 
 void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 {
 
 void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 {

-    m_paramTypes.Add(_T(""));
+    m_paramTypes.Add(wxEmptyString);

 
     m_paramNames.Add(wxString::FromAscii(pSymInfo->Name));
 
     // if symbol information is corrupted and we crash, the exception is going
     // to be ignored when we're called from WalkFromException() because of the
 
     m_paramNames.Add(wxString::FromAscii(pSymInfo->Name));
 
     // if symbol information is corrupted and we crash, the exception is going
     // to be ignored when we're called from WalkFromException() because of the

-    // except handler there returning EXCEPTION_CONTINUE_EXECUTION, but we'd be
-    // left in an inconsistent state, so deal with it explicitely here (even if
-    // normally we should never crash, of course...)
+    // exception handler there returning EXCEPTION_CONTINUE_EXECUTION, but we'd
+    // be left in an inconsistent state, so deal with it explicitly here (even
+    // if normally we should never crash, of course...)

 #ifdef _CPPUNWIND
     try
 #else
 #ifdef _CPPUNWIND
     try
 #else


@@ -154,7 +154,7 @@ void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
     __except ( EXCEPTION_EXECUTE_HANDLER )
 #endif
     {
     __except ( EXCEPTION_EXECUTE_HANDLER )
 #endif
     {

-        m_paramValues.Add(_T(""));
+        m_paramValues.Add(wxEmptyString);

     }
 }
 
     }
 }
 


@@ -218,8 +218,12 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
 {
     if ( !wxDbgHelpDLL::Init() )
     {
 {
     if ( !wxDbgHelpDLL::Init() )
     {

-        wxLogError(_("Failed to get stack backtrace:\n%s"),
+        // don't log a user-visible error message here because the stack trace
+        // is only needed for debugging/diagnostics anyhow and we shouldn't
+        // confuse the user by complaining that we couldn't generate it
+        wxLogDebug(_T("Failed to get stack backtrace: %s"),

                    wxDbgHelpDLL::GetErrorMessage().c_str());
                    wxDbgHelpDLL::GetErrorMessage().c_str());

+        return;

     }
 
     // according to MSDN, the first parameter should be just a unique value and
     }
 
     // according to MSDN, the first parameter should be just a unique value and