[Project64] Cleanup Language Class

This commit is contained in:
zilmar 2015-11-14 11:16:03 +11:00
parent e28c7be3f9
commit b6c6e192ee
3 changed files with 401 additions and 401 deletions

File diff suppressed because it is too large Load Diff

View File

@ -29,14 +29,14 @@ typedef std::list<LanguageFile> LanguageList;
class CLanguage class CLanguage
{ {
public: public:
CLanguage (); CLanguage();
const std::wstring & GetString ( LanguageStringID StringID ); const std::wstring & GetString(LanguageStringID StringID);
LanguageList & GetLangList ( void ); LanguageList & GetLangList(void);
void SetLanguage ( const wchar_t * LanguageName ); void SetLanguage(const wchar_t * LanguageName);
bool LoadCurrentStrings ( void ); bool LoadCurrentStrings(void);
bool IsCurrentLang ( LanguageFile & File ); bool IsCurrentLang(LanguageFile & File);
bool IsLanguageLoaded ( void ) const { return m_LanguageLoaded; } bool IsLanguageLoaded(void) const { return m_LanguageLoaded; }
private: private:
CLanguage(const CLanguage&); // Disable copy constructor CLanguage(const CLanguage&); // Disable copy constructor
@ -48,16 +48,16 @@ private:
LANG_STRINGS m_CurrentStrings, m_DefaultStrings; LANG_STRINGS m_CurrentStrings, m_DefaultStrings;
LanguageList m_LanguageList; LanguageList m_LanguageList;
std::wstring GetLangString ( const char * FileName, LanguageStringID ID ); std::wstring GetLangString(const char * FileName, LanguageStringID ID);
LANG_STR GetNextLangString ( void * OpenFile ); LANG_STR GetNextLangString(void * OpenFile);
void LoadDefaultStrings ( void ); void LoadDefaultStrings(void);
bool m_LanguageLoaded; bool m_LanguageLoaded;
}; };
extern CLanguage * g_Lang; extern CLanguage * g_Lang;
inline const wchar_t * GS (LanguageStringID StringID) inline const wchar_t * GS(LanguageStringID StringID)
{ {
return g_Lang->GetString(StringID).c_str(); return g_Lang->GetString(StringID).c_str();
} }

View File

@ -13,13 +13,13 @@
class CLanguageSelector class CLanguageSelector
{ {
public: public:
CLanguageSelector (); CLanguageSelector();
void Select ( void ); void Select(void);
private: private:
CLanguageSelector(const CLanguageSelector&); // Disable copy constructor CLanguageSelector(const CLanguageSelector&); // Disable copy constructor
CLanguageSelector& operator=(const CLanguageSelector&); // Disable assignment CLanguageSelector& operator=(const CLanguageSelector&); // Disable assignment
static LRESULT CALLBACK LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK LangSelectProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
}; };