OS/2 updates for debugging and statusbar processing

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index ff519fcfef3e6994ade97a267afc460c26922531..f9e8f15a2a38e30b79fb02eacc6bd110dc937034 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -62,19 +62,24 @@ public:
         // call Init() if you use this ctor
     wxLocale();
         // the ctor has a side effect of changing current locale
-    wxLocale(const wxChar *szName,              // name (for messages)
+    wxLocale(const wxChar *szName,                               // name (for messages)
              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?
-        { Init(szName, szShort, szLocale, bLoadDefault); }
+             bool bLoadDefault = TRUE,                           // preload wxstd.mo?
+             bool bConvertEncoding = FALSE)                      // convert Win<->Unix if neccessary?
+        { Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding); }
         // the same as a function (returns TRUE on success)
     bool Init(const wxChar *szName,
               const wxChar *szShort = (const wxChar *) NULL,
               const wxChar *szLocale = (const wxChar *) NULL,
-              bool bLoadDefault = TRUE);
+              bool bLoadDefault = TRUE,
+              bool bConvertEncoding = FALSE);
         // restores old locale
     ~wxLocale();
 
+    // 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; }
 
@@ -108,7 +113,7 @@ public:
     // domains are searched in the last to first order, i.e. catalogs
     // added later override those added before.
     const wxMB2WXbuf GetString(const wxChar *szOrigString,
-                              const wxChar *szDomain = (const wxChar *) NULL) const;
+                               const wxChar *szDomain = (const wxChar *) NULL) const;
 
     // Returns the current short name for the locale
     const wxString& GetName() const { return m_strShort; }
@@ -117,13 +122,15 @@ private:
     // find catalog by name in a linked list, return NULL if !found
     wxMsgCatalog  *FindCatalog(const wxChar *szDomain) const;
 
-    wxString       m_strLocale,     // this locale name
-                   m_strShort;      // short name for the locale
+    wxString       m_strLocale,       // this locale name
+                   m_strShort;        // short name for the locale
+
+    const wxChar  *m_pszOldLocale;    // previous locale from setlocale()
+    wxLocale      *m_pOldLocale;      // previous wxLocale
 
-    const wxChar  *m_pszOldLocale;  // previous locale from setlocale()
-    wxLocale      *m_pOldLocale;    // previous wxLocale
+    wxMsgCatalog  *m_pMsgCat;         // pointer to linked list of catalogs
 
-    wxMsgCatalog  *m_pMsgCat;       // pointer to linked list of catalogs
+    bool           m_bConvertEncoding;
 };
 
 // ----------------------------------------------------------------------------