This commit is contained in:
Jeff Young 2021-09-26 16:34:32 +01:00
parent 67fb8cbe9e
commit 88ad249f76
1 changed files with 7 additions and 14 deletions

View File

@ -132,7 +132,7 @@ int ExecuteFile( const wxString& aEditorName, const wxString& aFileName, wxProce
if( wxFileExists( fullEditorName ) ) if( wxFileExists( fullEditorName ) )
{ {
int i = 0; int i = 0;
const char* args[4]; char const* args[4];
args[i++] = fullEditorName.c_str(); args[i++] = fullEditorName.c_str();
@ -185,14 +185,7 @@ bool OpenPDF( const wxString& file )
} }
else else
{ {
const char* args[3]; char const* args[3];
#if 0 // Is this still needed with the separate arguments version of wxExecute?
#ifdef __WXMSW__
// Windows requires double quotes around the filename to handle spaces
filename = "\"" + filename + "\"";
#endif
#endif
args[0] = Pgm().GetPdfBrowserName().c_str(); args[0] = Pgm().GetPdfBrowserName().c_str();
args[1] = filename.c_str(); args[1] = filename.c_str();
@ -289,12 +282,12 @@ bool doPrintFile( const wxString& file, bool aDryRun )
{ {
if( !aDryRun ) if( !aDryRun )
{ {
const char* params[3]; char const* args[3];
params[0] = "lp"; args[0] = "lp";
params[1] = file.c_str(); args[1] = file.c_str();
params[2] = nullptr; args[2] = nullptr;
wxExecute( params ); wxExecute( args );
} }
return true; return true;