X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58d5dfc1685e364e00f032519f01dfe7597c8f46..ff1865910312d960737474a75a77737d5ce94864:/include/wx/intl.h?ds=sidebyside

diff --git a/include/wx/intl.h b/include/wx/intl.h
index aaf724eacd..7005b680bb 100644
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __INTLH__
-#define   __INTLH__
+#ifndef _WX_INTL_H_
+#define _WX_INTL_H_
 
 #ifdef __GNUG__
     #pragma interface "intl.h"
@@ -21,6 +21,8 @@
 
 #if wxUSE_INTL
 
+#include "wx/fontenc.h"
+
 // ============================================================================
 // global decls
 // ============================================================================
@@ -301,8 +303,6 @@ enum wxLanguage
 
 // --- --- --- generated code ends here --- --- ---
 
-
-
 // ----------------------------------------------------------------------------
 // wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc.
 //                 translation information
@@ -313,8 +313,9 @@ struct WXDLLEXPORT wxLanguageInfo
     int Language;                   // wxLanguage id
     wxString CanonicalName;         // Canonical name, e.g. fr_FR
 #ifdef __WIN32__
-    wxUint32 WinLang, WinSublang;   // Win32 language identifiers
-#endif
+    wxUint32 WinLang,               // Win32 language identifiers
+             WinSublang;
+#endif // __WIN32__
     wxString Description;           // human-readable name of the language
 };
 
@@ -329,7 +330,6 @@ enum wxLocaleInitFlags
     wxLOCALE_CONV_ENCODING = 0x0002      // convert encoding on the fly?
 };
 
-
 class WXDLLEXPORT wxLocale
 {
 public:
@@ -370,6 +370,14 @@ public:
     // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
     static int GetSystemLanguage();
 
+    // get the encoding used by default for text on this system, returns
+    // wxFONTENCODING_SYSTEM if it couldn't be determined
+    static wxFontEncoding GetSystemEncoding();
+
+    // get the string describing the system encoding, return empty string if
+    // couldn't be determined
+    static wxString GetSystemEncodingName();
+
     // return TRUE if the locale was set successfully
     bool IsOk() const { return m_pszOldLocale != NULL; }
 
@@ -482,7 +490,9 @@ inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
 
 #define wxTRANSLATE(str) _T(str)
 
-inline const wxChar *wxGetTranslation(const wxChar *sz) { return sz; }
+// Note: use of 'inline' here can cause this symbol not to be found when compiled with gcc
+//const wxChar *wxGetTranslation(const wxChar *sz);
+#define wxGetTranslation(sz) (sz)
 
 #endif // wxUSE_INTL/!wxUSE_INTL
 
@@ -492,5 +502,5 @@ inline const wxChar *wxGetTranslation(const wxChar *sz) { return sz; }
     #define gettext_noop(str) _T(str)
 #endif
 
-#endif
-    // _WX_INTLH__
+#endif // _WX_INTL_H_
+