From fe267c2fad7b47d09da3985702813bed7387870c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 29 May 2008 13:28:05 +0000 Subject: [PATCH] take wxString in wxCrashReport::SetFileName() to allow passing either ASCII or wide strings as well as wxStrings to this method (closes 9505) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/crashrpt.h | 4 ++-- src/msw/crashrpt.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/crashrpt.h b/include/wx/msw/crashrpt.h index 8a358e99ff..6ee6e75205 100644 --- a/include/wx/msw/crashrpt.h +++ b/include/wx/msw/crashrpt.h @@ -94,10 +94,10 @@ struct WXDLLIMPEXP_BASE wxCrashReport { // set the name of the file to which the report is written, it is // constructed from the .exe name by default - static void SetFileName(const wxChar *filename); + static void SetFileName(const wxString& filename); // return the current file name - static const wxChar *GetFileName(); + static wxString GetFileName(); // write the exception report to the file, return true if it could be done // or false otherwise diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp index d2a303abbe..795e7f6f02 100644 --- a/src/msw/crashrpt.cpp +++ b/src/msw/crashrpt.cpp @@ -245,14 +245,14 @@ 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); + wxStrncpy(gs_reportFilename, filename.c_str(), WXSIZEOF(gs_reportFilename) - 1); gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0'); } /* static */ -const wxChar *wxCrashReport::GetFileName() +wxString wxCrashReport::GetFileName() { return gs_reportFilename; }