Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

take wxString in wxCrashReport::SetFileName() to allow passing either ASCII or wide strings as well as wxStrings to this method (closes 9505)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-29 13:28:05 +00:00
parent 838bfb19e0
commit fe267c2fad
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/crashrpt.h
View File

@@ -94,10 +94,10 @@ struct WXDLLIMPEXP_BASE wxCrashReport
{ {
// set the name of the file to which the report is written, it is // set the name of the file to which the report is written, it is
// constructed from the .exe name by default // constructed from the .exe name by default
static void SetFileName(const wxChar *filename); static void SetFileName(const wxString& filename);
// return the current file name // 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 // write the exception report to the file, return true if it could be done
// or false otherwise // or false otherwise

6
src/msw/crashrpt.cpp
View File

@@ -245,14 +245,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/* static */ /* 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'); gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0');
} }
/* static */ /* static */
const wxChar *wxCrashReport::GetFileName() wxString wxCrashReport::GetFileName()
{ {
return gs_reportFilename; return gs_reportFilename;
} }