Add wxProgressDialog::Was{Cancelled,Skipped}() convenience methods.

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 28bb8ce1664fb76b89a03c7000c946e0b81321b2..a7b4dd133ced413d9df2650b2535182f95f99d0c 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -408,8 +408,12 @@ enum wxLocaleInfo
 
 enum wxLocaleInitFlags
 {
-    wxLOCALE_LOAD_DEFAULT  = 0x0001,     // load wxwin.mo?
-    wxLOCALE_CONV_ENCODING = 0x0002      // convert encoding on the fly?
+    wxLOCALE_DONT_LOAD_DEFAULT = 0x0000,     // don't load wxwin.mo
+    wxLOCALE_LOAD_DEFAULT      = 0x0001      // load wxwin.mo?
+#if WXWIN_COMPATIBILITY_2_8
+   ,wxLOCALE_CONV_ENCODING     = 0x0002      // no longer used, simply remove
+                                             // it from the existing code
+#endif
 };
 
 class WXDLLIMPEXP_BASE wxLocale
@@ -425,16 +429,23 @@ public:
     wxLocale(const wxString& name,                               // name (for messages)
              const wxString& shortName = wxEmptyString,      // dir prefix (for msg files)
              const wxString& locale = wxEmptyString,     // locale (for setlocale)
-             bool bLoadDefault = true,                           // preload wxstd.mo?
-             bool bConvertEncoding = false)                      // convert Win<->Unix if necessary?
+             bool bLoadDefault = true                            // preload wxstd.mo?
+#if WXWIN_COMPATIBILITY_2_8
+             ,bool bConvertEncoding = true                      // convert Win<->Unix if necessary?
+#endif
+             )
         {
             DoCommonInit();
 
+#if WXWIN_COMPATIBILITY_2_8
             Init(name, shortName, locale, bLoadDefault, bConvertEncoding);
+#else
+            Init(name, shortName, locale, bLoadDefault);
+#endif
         }
 
     wxLocale(int language, // wxLanguage id or custom language
-             int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
+             int flags = wxLOCALE_LOAD_DEFAULT)
         {
             DoCommonInit();
 
@@ -445,12 +456,15 @@ public:
     bool Init(const wxString& name,
               const wxString& shortName = wxEmptyString,
               const wxString& locale = wxEmptyString,
-              bool bLoadDefault = true,
-              bool bConvertEncoding = false);
+              bool bLoadDefault = true
+#if WXWIN_COMPATIBILITY_2_8
+              ,bool bConvertEncoding = true
+#endif
+              );
 
         // same as second ctor (returns true on success)
     bool Init(int language = wxLANGUAGE_DEFAULT,
-              int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+              int flags = wxLOCALE_LOAD_DEFAULT);
 
         // restores old locale
     virtual ~wxLocale();
@@ -591,8 +605,6 @@ private:
 
     wxMsgCatalog  *m_pMsgCat;         // pointer to linked list of catalogs
 
-    bool           m_bConvertEncoding;
-
     bool           m_initialized;
 
     static wxLanguageInfoArray *ms_languagesDB;