fixes error/usage messages given by the cmd line parsing logic in wxApp;

[wxWidgets.git] / include / wx / intl.h

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 89128347c7c990168e49c755baa042e64f8764d3..7005b680bb92254616ba105ce577bc658a0ba61b 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        intl.h
+// Name:        wx/intl.h

 // Purpose:     Internationalization and localisation for wxWindows
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     Internationalization and localisation for wxWindows
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef   __INTLH__
-#define   __INTLH__
+#ifndef _WX_INTL_H_
+#define _WX_INTL_H_

 
 #ifdef __GNUG__
     #pragma interface "intl.h"
 
 #ifdef __GNUG__
     #pragma interface "intl.h"


@@ -21,6 +21,8 @@
 
 #if wxUSE_INTL
 
 
 #if wxUSE_INTL
 

+#include "wx/fontenc.h"
+

 // ============================================================================
 // global decls
 // ============================================================================
 // ============================================================================
 // global decls
 // ============================================================================


@@ -62,10 +64,10 @@ class WXDLLEXPORT wxLanguageInfoArray;
 enum wxLanguage
 {
     // user's default/preffered language as got from OS:
 enum wxLanguage
 {
     // user's default/preffered language as got from OS:

-    wxLANGUAGE_DEFAULT, 
+    wxLANGUAGE_DEFAULT,

     // unknown language, if wxLocale::GetSystemLanguage fails:
     // unknown language, if wxLocale::GetSystemLanguage fails:

-    wxLANGUAGE_UNKNOWN, 
-    
+    wxLANGUAGE_UNKNOWN,
+

     wxLANGUAGE_ABKHAZIAN,
     wxLANGUAGE_AFAR,
     wxLANGUAGE_AFRIKAANS,
     wxLANGUAGE_ABKHAZIAN,
     wxLANGUAGE_AFAR,
     wxLANGUAGE_AFRIKAANS,


@@ -301,8 +303,6 @@ enum wxLanguage
 
 // --- --- --- generated code ends here --- --- ---
 
 
 // --- --- --- generated code ends here --- --- ---
 

-
-

 // ----------------------------------------------------------------------------
 // wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc.
 //                 translation information
 // ----------------------------------------------------------------------------
 // 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__
     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
 };
 
     wxString Description;           // human-readable name of the language
 };
 


@@ -329,7 +330,6 @@ enum wxLocaleInitFlags
     wxLOCALE_CONV_ENCODING = 0x0002      // convert encoding on the fly?
 };
 
     wxLOCALE_CONV_ENCODING = 0x0002      // convert encoding on the fly?
 };
 

-

 class WXDLLEXPORT wxLocale
 {
 public:
 class WXDLLEXPORT wxLocale
 {
 public:


@@ -344,8 +344,8 @@ public:
              const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
              bool bLoadDefault = TRUE,                           // preload wxstd.mo?
              bool bConvertEncoding = FALSE)                      // convert Win<->Unix if neccessary?
              const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
              bool bLoadDefault = TRUE,                           // preload wxstd.mo?
              bool bConvertEncoding = FALSE)                      // convert Win<->Unix if neccessary?

-        { 
-            Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding); 
+        {
+            Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding);

         }
 
     wxLocale(int language, // wxLanguage id or custom language
         }
 
     wxLocale(int language, // wxLanguage id or custom language


@@ -365,28 +365,36 @@ public:
 
         // restores old locale
     ~wxLocale();
 
         // restores old locale
     ~wxLocale();

-    
+

     // Try to get user's (or OS's) prefered language setting.
     // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
     static int GetSystemLanguage();
 
     // Try to get user's (or OS's) prefered language setting.
     // 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; }
 
     // returns locale name
     const wxChar *GetLocale() const { return m_strLocale; }
     // return TRUE if the locale was set successfully
     bool IsOk() const { return m_pszOldLocale != NULL; }
 
     // returns locale name
     const wxChar *GetLocale() const { return m_strLocale; }

-    
+

     // return current locale wxLanguage value
     int GetLanguage() const { return m_language; }
 
     // return current locale wxLanguage value
     int GetLanguage() const { return m_language; }
 

-    // return locale name to be passed to setlocale()    
+    // return locale name to be passed to setlocale()

     wxString GetSysName() const;
 
     wxString GetSysName() const;
 

-    // return 'canonical' name, i.e. in the form of xx[_YY], where xx is 
+    // return 'canonical' name, i.e. in the form of xx[_YY], where xx is

     // language code according to ISO 639 and YY is country name
     // as specified by ISO 3166.
     wxString GetCanonicalName() const { return m_strShort; }
     // language code according to ISO 639 and YY is country name
     // as specified by ISO 3166.
     wxString GetCanonicalName() const { return m_strShort; }

-    
+

     // add a prefix to the catalog lookup path: the message catalog files will be
     // looked up under prefix/<lang>/LC_MESSAGES, prefix/LC_MESSAGES and prefix
     // (in this order).
     // add a prefix to the catalog lookup path: the message catalog files will be
     // looked up under prefix/<lang>/LC_MESSAGES, prefix/LC_MESSAGES and prefix
     // (in this order).


@@ -405,7 +413,7 @@ public:
 
     // check if the given catalog is loaded
     bool IsLoaded(const wxChar *szDomain) const;
 
     // check if the given catalog is loaded
     bool IsLoaded(const wxChar *szDomain) const;

-    
+

     // Add custom language to the list of known languages.
     // Notes: 1) wxLanguageInfo contains platform-specific data
     //        2) must be called before Init to have effect
     // Add custom language to the list of known languages.
     // Notes: 1) wxLanguageInfo contains platform-specific data
     //        2) must be called before Init to have effect


@@ -436,7 +444,7 @@ public:
 private:
     // find catalog by name in a linked list, return NULL if !found
     wxMsgCatalog  *FindCatalog(const wxChar *szDomain) const;
 private:
     // find catalog by name in a linked list, return NULL if !found
     wxMsgCatalog  *FindCatalog(const wxChar *szDomain) const;

-    
+

     // copy default table of languages from global static array to
     // m_langugagesInfo, called by InitLanguagesDB
     static void InitLanguagesDB();
     // copy default table of languages from global static array to
     // m_langugagesInfo, called by InitLanguagesDB
     static void InitLanguagesDB();


@@ -449,7 +457,7 @@ private:
     wxLocale      *m_pOldLocale;      // previous wxLocale
 
     wxMsgCatalog  *m_pMsgCat;         // pointer to linked list of catalogs
     wxLocale      *m_pOldLocale;      // previous wxLocale
 
     wxMsgCatalog  *m_pMsgCat;         // pointer to linked list of catalogs

-    
+

     bool           m_bConvertEncoding;
 
     static wxLanguageInfoArray *ms_languagesDB;
     bool           m_bConvertEncoding;
 
     static wxLanguageInfoArray *ms_languagesDB;


@@ -482,7 +490,9 @@ inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
 
 #define wxTRANSLATE(str) _T(str)
 
 
 #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
 
 
 #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
 
     #define gettext_noop(str) _T(str)
 #endif
 

-#endif
-    // _WX_INTLH__
+#endif // _WX_INTL_H_
+