X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11aac4baa6172481674b017e8529ad7ef18758fd..595cf498a5f328907b8e446c0bdd040b7f22942b:/src/msw/crashrpt.cpp

diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index d1a372467d..2b0e276cef 100644
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -227,7 +227,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     }
     else // dbghelp.dll couldn't be loaded
     {
-        Output(wxDbgHelpDLL::GetErrorMessage());
+        Output(_T("%s"), wxDbgHelpDLL::GetErrorMessage().c_str());
     }
 #else // !wxUSE_DBGHELP
     wxUnusedVar(flags);
@@ -245,14 +245,13 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 // ----------------------------------------------------------------------------
 
 /* static */
-void wxCrashReport::SetFileName(const wxChar *filename)
+void wxCrashReport::SetFileName(const wxString& filename)
 {
-    wxStrncpy(gs_reportFilename, filename, WXSIZEOF(gs_reportFilename) - 1);
-    gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0');
+    wxStrlcpy(gs_reportFilename, filename.wx_str(), WXSIZEOF(gs_reportFilename));
 }
 
 /* static */
-const wxChar *wxCrashReport::GetFileName()
+wxString wxCrashReport::GetFileName()
 {
     return gs_reportFilename;
 }