diff --git a/Source/Project64/Multilanguage/Language Class.h b/Source/Project64/Multilanguage/Language Class.h index d1f118e94..1282e5e10 100644 --- a/Source/Project64/Multilanguage/Language Class.h +++ b/Source/Project64/Multilanguage/Language Class.h @@ -1,5 +1,3 @@ -#ifdef __cplusplus - #include "..\support.h" #pragma warning(disable:4786) @@ -18,6 +16,18 @@ typedef struct { typedef std::list LanguageList; class CLanguage { +public: + CLanguage ( ); + const stdstr & GetString ( LanguageStringID StringID ); + LanguageList & GetLangList ( void ); + void SetLanguage ( char * LanguageName ); + void LoadCurrentStrings ( bool ShowSelectDialog ); + bool IsCurrentLang ( LanguageFile & File ); + +private: + CLanguage(const CLanguage&); // Disable copy constructor + CLanguage& operator=(const CLanguage&); // Disable assignment + stdstr m_SelectedLanguage; const stdstr m_emptyString; @@ -27,14 +37,6 @@ class CLanguage { stdstr GetLangString ( const char * FileName, LanguageStringID ID ); LANG_STR GetNextLangString ( void * OpenFile ); void LoadDefaultStrings ( void ); - -public: - CLanguage ( ); - const stdstr & GetString ( LanguageStringID StringID ); - LanguageList & GetLangList ( void ); - void SetLanguage ( char * LanguageName ); - void LoadCurrentStrings ( bool ShowSelectDialog ); - bool IsCurrentLang ( LanguageFile & File ); }; extern CLanguage * _Lang; @@ -43,5 +45,3 @@ inline LPCSTR GS (LanguageStringID StringID) { return _Lang->GetString(StringID).c_str(); } - -#endif \ No newline at end of file