add wxScrollHelper::ShowScrollbars() (implemented for GTK only right now, generic...

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

diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 542715a0f06f8fa5cc0e0ecc221a79175d064941..e9044154a70eca3e170761c249058583beeab566 100644 (file)
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -253,7 +253,7 @@ wxDebugReport::~wxDebugReport()
 wxString wxDebugReport::GetReportName() const
 {
     if(wxTheApp)
 wxString wxDebugReport::GetReportName() const
 {
     if(wxTheApp)

-        return wxTheApp->GetAppName();
+        return wxTheApp->GetAppDisplayName();

 
     return _T("wx");
 }
 
     return _T("wx");
 }


@@ -478,11 +478,13 @@ bool wxDebugReport::AddContext(wxDebugReport::Context ctx)
 #if wxUSE_STACKWALKER
     wxXmlNode *nodeStack = new wxXmlNode(wxXML_ELEMENT_NODE, _T("stack"));
     XmlStackWalker sw(nodeStack);
 #if wxUSE_STACKWALKER
     wxXmlNode *nodeStack = new wxXmlNode(wxXML_ELEMENT_NODE, _T("stack"));
     XmlStackWalker sw(nodeStack);

+#if wxUSE_ON_FATAL_EXCEPTION

     if ( ctx == Context_Exception )
     {
         sw.WalkFromException();
     }
     else // Context_Current
     if ( ctx == Context_Exception )
     {
         sw.WalkFromException();
     }
     else // Context_Current

+#endif // wxUSE_ON_FATAL_EXCEPTION

     {
         sw.Walk();
     }
     {
         sw.Walk();
     }


@@ -572,7 +574,7 @@ bool wxDebugReport::DoProcess()
     for ( size_t n = 0; n < count; n++ )
     {
         GetFile(n, &name, &desc);
     for ( size_t n = 0; n < count; n++ )
     {
         GetFile(n, &name, &desc);

-        msg += wxString::Format(_("\t%s: %s\n"), name.c_str(), desc.c_str());
+        msg += wxString::Format("\t%s: %s\n", name, desc);

     }
 
     msg += _("\nPlease send this report to the program maintainer, thank you!\n");
     }
 
     msg += _("\nPlease send this report to the program maintainer, thank you!\n");