Fix Windows build...
... unfortunately inclusion of ErrorDialog.h in FileNames.h ties nine files into a low-level s.c.c.
This commit is contained in:
parent
6d257b04da
commit
273ba9f64d
|
@ -36,6 +36,7 @@ used throughout Audacity into this one place.
|
|||
#include "Internat.h"
|
||||
#include "PlatformCompatibility.h"
|
||||
#include "wxFileNameWrapper.h"
|
||||
#include "widgets/ErrorDialog.h"
|
||||
#include "../lib-src/FileDialog/FileDialog.h"
|
||||
|
||||
#if defined(__WXMAC__) || defined(__WXGTK__)
|
||||
|
@ -583,6 +584,8 @@ void FileNames::FindFilesInPathList(const wxString & pattern,
|
|||
}
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
wxCharBuffer FileNames::mFilename;
|
||||
|
||||
//
|
||||
// On Windows, wxString::mb_str() can return a NULL pointer if the
|
||||
// conversion to multi-byte fails. So, based on direction intent,
|
||||
|
|
|
@ -149,6 +149,9 @@ public:
|
|||
* on Windows */
|
||||
#if defined(__WXMSW__)
|
||||
static char *VerifyFilename(const wxString &s, bool input = true);
|
||||
|
||||
// stuff for file name sanitisation
|
||||
static wxCharBuffer mFilename;
|
||||
#endif
|
||||
|
||||
private:
|
||||
|
|
|
@ -40,7 +40,6 @@ and on Mac OS X for the filesystem.
|
|||
|
||||
wxChar Internat::mDecimalSeparator = wxT('.'); // default
|
||||
wxArrayString Internat::exclude;
|
||||
wxCharBuffer Internat::mFilename;
|
||||
|
||||
// DA: Use tweaked translation mechanism to replace 'Audacity' by 'DarkAudacity'.
|
||||
#ifdef EXPERIMENTAL_DA
|
||||
|
|
|
@ -142,10 +142,7 @@ public:
|
|||
private:
|
||||
static wxChar mDecimalSeparator;
|
||||
|
||||
// stuff for file name sanitisation
|
||||
static wxArrayString exclude;
|
||||
|
||||
static wxCharBuffer mFilename;
|
||||
};
|
||||
|
||||
#define _NoAcc(X) Internat::StripAccelerators(_(X))
|
||||
|
|
|
@ -29,7 +29,7 @@ system by constructing BatchCommandEval objects.
|
|||
#include "ScriptCommandRelay.h"
|
||||
#include "CommandContext.h"
|
||||
#include "CommandTargets.h"
|
||||
#include "Shuttle.h"
|
||||
#include "../Shuttle.h"
|
||||
|
||||
CommandBuilder::CommandBuilder(const wxString &cmdString)
|
||||
: mValid(false)
|
||||
|
|
|
@ -287,6 +287,7 @@ wxString GUIPrefs::InitLang( wxString langCode )
|
|||
return SetLang(langCode);
|
||||
}
|
||||
|
||||
#define IPC_APPL wxT("audacity")
|
||||
static std::unique_ptr<wxLocale> sLocale;
|
||||
|
||||
wxString GUIPrefs::SetLang( const wxString & lang )
|
||||
|
|
Loading…
Reference in New Issue