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
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user