Replace wxLocale::ms_languagesDB dynamic array with a wxVector
There is no reason to use the macro-based classes for this array as there are no compatibility constraints here, so use a simple vector instead. Note that we need an extra boolean variable now that we don't use a pointer because we can't just check whether the vector is empty, as this would return in infinite recursion when InitLanguagesDB() calls AddLanguage() which, in turn, calls CreateLanguagesDB().
This commit is contained in:
@@ -35,7 +35,6 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_BASE wxLocale;
|
||||
class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray;
|
||||
|
||||
// ============================================================================
|
||||
// locale support
|
||||
@@ -285,8 +284,6 @@ private:
|
||||
|
||||
wxTranslations m_translations;
|
||||
|
||||
static wxLanguageInfoArray *ms_languagesDB;
|
||||
|
||||
wxDECLARE_NO_COPY_CLASS(wxLocale);
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user