Fix for broken build (::None)
None clashed with something else under linux, probably a macro expansion.
This commit is contained in:
parent
dddac6e47d
commit
aee0c4cbc6
|
@ -519,7 +519,7 @@ public:
|
|||
"Where would I find the file '%s'?" instead if you want. */
|
||||
question.Printf(_("Where is '%s'?"), mName.c_str());
|
||||
|
||||
wxString path = FileNames::SelectFile(FileNames::Operation::None,
|
||||
wxString path = FileNames::SelectFile(FileNames::Operation::_None,
|
||||
question,
|
||||
mLibPath.GetPath(),
|
||||
mLibPath.GetName(),
|
||||
|
|
|
@ -347,7 +347,7 @@ namespace {
|
|||
key = wxT("/DefaultOpenPath"); break;
|
||||
case FileNames::Operation::Export:
|
||||
key = wxT("/DefaultExportPath"); break;
|
||||
case FileNames::Operation::None:
|
||||
case FileNames::Operation::_None:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -72,7 +72,8 @@ public:
|
|||
// If not None, determines a preference key (for the default path string) to
|
||||
// be read and updated
|
||||
enum class Operation {
|
||||
None,
|
||||
// _ on None to defeat some macro that is expanding this.
|
||||
_None,
|
||||
Open,
|
||||
Export
|
||||
};
|
||||
|
|
|
@ -30,6 +30,7 @@ and on Mac OS X for the filesystem.
|
|||
|
||||
#include "Internat.h"
|
||||
#include "Experimental.h"
|
||||
#include "FileNames.h"
|
||||
|
||||
// in order for the static member variables to exist, they must appear here
|
||||
// (_outside_) the class definition, in order to be allocated some storage.
|
||||
|
@ -245,7 +246,7 @@ char *Internat::VerifyFilename(const wxString &s, bool input)
|
|||
wxMessageBox(_("The specified filename could not be converted due to Unicode character use."));
|
||||
|
||||
ext = ff.GetExt();
|
||||
name = FileNames::SelectFile(FileNames::Operation::None,
|
||||
name = FileNames::SelectFile(FileNames::Operation::_None,
|
||||
_("Specify New Filename:"),
|
||||
wxEmptyString,
|
||||
name,
|
||||
|
|
|
@ -1152,7 +1152,7 @@ void TagsEditor::OnLoad(wxCommandEvent & WXUNUSED(event))
|
|||
wxString fn;
|
||||
|
||||
// Ask the user for the real name
|
||||
fn = FileNames::SelectFile(FileNames::Operation::None,
|
||||
fn = FileNames::SelectFile(FileNames::Operation::_None,
|
||||
_("Load Metadata As:"),
|
||||
FileNames::DataDir(),
|
||||
wxT("Tags.xml"),
|
||||
|
@ -1207,7 +1207,7 @@ void TagsEditor::OnSave(wxCommandEvent & WXUNUSED(event))
|
|||
TransferDataFromWindow();
|
||||
|
||||
// Ask the user for the real name
|
||||
fn = FileNames::SelectFile(FileNames::Operation::None,
|
||||
fn = FileNames::SelectFile(FileNames::Operation::_None,
|
||||
_("Save Metadata As:"),
|
||||
FileNames::DataDir(),
|
||||
wxT("Tags.xml"),
|
||||
|
|
|
@ -1798,7 +1798,7 @@ void VSTEffect::ExportPresets()
|
|||
//
|
||||
// Passing a valid parent will cause some effects dialogs to malfunction
|
||||
// upon returning from the FileNames::SelectFile().
|
||||
path = FileNames::SelectFile(FileNames::Operation::None,
|
||||
path = FileNames::SelectFile(FileNames::Operation::_None,
|
||||
_("Save VST Preset As:"),
|
||||
FileNames::DataDir(),
|
||||
wxEmptyString,
|
||||
|
@ -1850,7 +1850,7 @@ void VSTEffect::ImportPresets()
|
|||
wxString path;
|
||||
|
||||
// Ask the user for the real name
|
||||
path = FileNames::SelectFile(FileNames::Operation::None,
|
||||
path = FileNames::SelectFile(FileNames::Operation::_None,
|
||||
_("Load VST Preset:"),
|
||||
FileNames::DataDir(),
|
||||
wxEmptyString,
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <wx/process.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include "FileNames.h"
|
||||
#include "../FileNames.h"
|
||||
#include "Export.h"
|
||||
|
||||
#include "../Mix.h"
|
||||
|
|
|
@ -660,7 +660,7 @@ public:
|
|||
* "Where would I find the file %s" instead if you want. */
|
||||
question.Printf(_("Where is %s?"), mName.c_str());
|
||||
|
||||
wxString path = FileNames::SelectFile(FileNames::Operation::None,
|
||||
wxString path = FileNames::SelectFile(FileNames::Operation::_None,
|
||||
question,
|
||||
mLibPath.GetPath(),
|
||||
mLibPath.GetName(),
|
||||
|
|
|
@ -39,7 +39,7 @@ KeyConfigPrefs and MousePrefs use.
|
|||
#include "../Internat.h"
|
||||
#include "../ShuttleGui.h"
|
||||
|
||||
#include "FileNames.h"
|
||||
#include "../FileNames.h"
|
||||
|
||||
#if defined(EXPERIMENTAL_KEY_VIEW)
|
||||
|
||||
|
|
Loading…
Reference in New Issue