git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34621
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
// if we don't have place marker for file name in the command...
wxString cmd = dlg.GetCommand();
// if we don't have place marker for file name in the command...
wxString cmd = dlg.GetCommand();
- if ( cmd.find(_T('%')) == wxString::npos )
- // ...add it
- cmd += _T(" \"%s\"");
+#if wxUSE_MIMETYPE
+ if ( cmd.find(_T('%')) != wxString::npos )
+ {
+ command = wxFileType::ExpandCommand(cmd, fn.GetFullPath());
+ }
+ else // no %s nor %1
+#endif // wxUSE_MIMETYPE
+ {
+ // append the file name to the end
+ command << cmd << _T(" \"") << fn.GetFullPath() << _T('"');
+ }
-
- command = wxFileType::ExpandCommand(cmd, fn.GetFullPath());