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:
Paul Licameli 2019-05-20 13:28:21 -04:00
parent 6d257b04da
commit 273ba9f64d
6 changed files with 8 additions and 5 deletions

View File

@ -36,6 +36,7 @@ used throughout Audacity into this one place.
#include "Internat.h" #include "Internat.h"
#include "PlatformCompatibility.h" #include "PlatformCompatibility.h"
#include "wxFileNameWrapper.h" #include "wxFileNameWrapper.h"
#include "widgets/ErrorDialog.h"
#include "../lib-src/FileDialog/FileDialog.h" #include "../lib-src/FileDialog/FileDialog.h"
#if defined(__WXMAC__) || defined(__WXGTK__) #if defined(__WXMAC__) || defined(__WXGTK__)
@ -583,6 +584,8 @@ void FileNames::FindFilesInPathList(const wxString & pattern,
} }
#if defined(__WXMSW__) #if defined(__WXMSW__)
wxCharBuffer FileNames::mFilename;
// //
// On Windows, wxString::mb_str() can return a NULL pointer if the // On Windows, wxString::mb_str() can return a NULL pointer if the
// conversion to multi-byte fails. So, based on direction intent, // conversion to multi-byte fails. So, based on direction intent,

View File

@ -149,6 +149,9 @@ public:
* on Windows */ * on Windows */
#if defined(__WXMSW__) #if defined(__WXMSW__)
static char *VerifyFilename(const wxString &s, bool input = true); static char *VerifyFilename(const wxString &s, bool input = true);
// stuff for file name sanitisation
static wxCharBuffer mFilename;
#endif #endif
private: private:

View File

@ -40,7 +40,6 @@ and on Mac OS X for the filesystem.
wxChar Internat::mDecimalSeparator = wxT('.'); // default wxChar Internat::mDecimalSeparator = wxT('.'); // default
wxArrayString Internat::exclude; wxArrayString Internat::exclude;
wxCharBuffer Internat::mFilename;
// DA: Use tweaked translation mechanism to replace 'Audacity' by 'DarkAudacity'. // DA: Use tweaked translation mechanism to replace 'Audacity' by 'DarkAudacity'.
#ifdef EXPERIMENTAL_DA #ifdef EXPERIMENTAL_DA

View File

@ -142,10 +142,7 @@ public:
private: private:
static wxChar mDecimalSeparator; static wxChar mDecimalSeparator;
// stuff for file name sanitisation
static wxArrayString exclude; static wxArrayString exclude;
static wxCharBuffer mFilename;
}; };
#define _NoAcc(X) Internat::StripAccelerators(_(X)) #define _NoAcc(X) Internat::StripAccelerators(_(X))

View File

@ -29,7 +29,7 @@ system by constructing BatchCommandEval objects.
#include "ScriptCommandRelay.h" #include "ScriptCommandRelay.h"
#include "CommandContext.h" #include "CommandContext.h"
#include "CommandTargets.h" #include "CommandTargets.h"
#include "Shuttle.h" #include "../Shuttle.h"
CommandBuilder::CommandBuilder(const wxString &cmdString) CommandBuilder::CommandBuilder(const wxString &cmdString)
: mValid(false) : mValid(false)

View File

@ -287,6 +287,7 @@ wxString GUIPrefs::InitLang( wxString langCode )
return SetLang(langCode); return SetLang(langCode);
} }
#define IPC_APPL wxT("audacity")
static std::unique_ptr<wxLocale> sLocale; static std::unique_ptr<wxLocale> sLocale;
wxString GUIPrefs::SetLang( const wxString & lang ) wxString GUIPrefs::SetLang( const wxString & lang )