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