added more HP-UX charset names

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index a8ee7b7c091e12f2197d0125b78f99aad16997d2..3e523ec95f383bd257a9eb8ab192ccb3fe242177 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -13,10 +13,6 @@
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "intl.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 


@@ -32,11 +28,12 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-// gettext() style macros (notice that xgettext should be invoked with 
-// --keyword="_" --keyword="wxGetTranslation:1,2" options
+// gettext() style macros (notice that xgettext should be invoked with
+// --keyword="_" --keyword="wxPLURAL:1,2" options

 // to extract the strings from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO
 // to extract the strings from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO

-    #define _(s)                  wxGetTranslation(_T(s))
+    #define _(s)                     wxGetTranslation(_T(s))
+    #define wxPLURAL(sing, plur, n)  wxGetTranslation(_T(sing), _T(plur), n)

 #endif
 
 // another one which just marks the strings for extraction, but doesn't
 #endif
 
 // another one which just marks the strings for extraction, but doesn't


@@ -48,8 +45,8 @@
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxLocale;
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxLocale;

-class WXDLLIMPEXP_BASE wxMsgCatalog;

 class WXDLLIMPEXP_BASE wxLanguageInfoArray;
 class WXDLLIMPEXP_BASE wxLanguageInfoArray;

+class wxMsgCatalog;

 
 // ============================================================================
 // locale support
 
 // ============================================================================
 // locale support


@@ -378,7 +375,7 @@ public:
              const wxChar *szShort = (const wxChar *) NULL,      // dir prefix (for msg files)
              const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
              bool bLoadDefault = true,                           // preload wxstd.mo?
              const wxChar *szShort = (const wxChar *) NULL,      // dir prefix (for msg files)
              const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
              bool bLoadDefault = true,                           // preload wxstd.mo?

-             bool bConvertEncoding = false)                      // convert Win<->Unix if neccessary?
+             bool bConvertEncoding = false)                      // convert Win<->Unix if necessary?

         {
             DoCommonInit();
 
         {
             DoCommonInit();
 


@@ -407,7 +404,7 @@ public:
         // restores old locale
     ~wxLocale();
 
         // restores old locale
     ~wxLocale();
 

-    // Try to get user's (or OS's) prefered language setting.
+    // Try to get user's (or OS's) preferred language setting.

     // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
     static int GetSystemLanguage();
 
     // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
     static int GetSystemLanguage();
 


@@ -455,6 +452,8 @@ public:
     //
     // Returns 'true' if it was successfully loaded
     bool AddCatalog(const wxChar *szDomain);
     //
     // Returns 'true' if it was successfully loaded
     bool AddCatalog(const wxChar *szDomain);

+    bool AddCatalog(const wxChar *szDomain,
+                    wxLanguage msgIdLanguage, const wxChar *msgIdCharset);

 
     // 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;


@@ -492,16 +491,20 @@ public:
     // domains are searched in the last to first order, i.e. catalogs
     // added later override those added before.
     const wxChar *GetString(const wxChar *szOrigString,
     // domains are searched in the last to first order, i.e. catalogs
     // added later override those added before.
     const wxChar *GetString(const wxChar *szOrigString,

-                            const wxChar *szDomain = (const wxChar *) NULL) const;
+                            const wxChar *szDomain = NULL) const;

     // plural form version of the same:
     const wxChar *GetString(const wxChar *szOrigString,
                             const wxChar *szOrigString2,
                             size_t n,
     // plural form version of the same:
     const wxChar *GetString(const wxChar *szOrigString,
                             const wxChar *szOrigString2,
                             size_t n,

-                            const wxChar *szDomain = (const wxChar *) NULL) const;
+                            const wxChar *szDomain = NULL) const;

 
     // Returns the current short name for the locale
     const wxString& GetName() const { return m_strShort; }
 
 
     // Returns the current short name for the locale
     const wxString& GetName() const { return m_strShort; }
 

+    // return the contents of .po file header
+    wxString GetHeaderValue( const wxChar* szHeader,
+                             const wxChar* szDomain = NULL ) const;
+

     // These two methods are for internal use only. First one creates
     // ms_languagesDB if it doesn't already exist, second one destroys
     // it.
     // These two methods are for internal use only. First one creates
     // ms_languagesDB if it doesn't already exist, second one destroys
     // it.