precompiled headers changed

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index da18e33025d12d6d9fa595293a5ebefaff521a19..8a72c6179655dfd2a1c166de0b76e15d62c32c69 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -33,12 +33,10 @@
 // ----------------------------------------------------------------------------
 
 // gettext() style macros (notice that xgettext should be invoked with 
 // ----------------------------------------------------------------------------
 
 // gettext() style macros (notice that xgettext should be invoked with 

-// --keyword="_" --keyword="_N:1,2" --keyword="N_" options
+// --keyword="_" --keyword="wxGetTranslation: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 _N(s1, s2, n)   wxGetTranslation(_T(s1), _T(s2), n)
-    #define N_(s)           _T(s)
+    #define _(s)                  wxGetTranslation(_T(s))

 #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


@@ -373,29 +371,36 @@ public:
     // -----------
 
         // call Init() if you use this ctor
     // -----------
 
         // call Init() if you use this ctor

-    wxLocale();
+    wxLocale() { DoCommonInit(); }
+

         // the ctor has a side effect of changing current locale
     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)
         // the ctor has a side effect of changing current locale
     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?
-             bool bConvertEncoding = FALSE)                      // convert Win<->Unix if neccessary?
+             bool bLoadDefault = true,                           // preload wxstd.mo?
+             bool bConvertEncoding = false)                      // convert Win<->Unix if neccessary?

         {
         {

+            DoCommonInit();
+

             Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding);
         }
 
     wxLocale(int language, // wxLanguage id or custom language
              int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
             Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding);
         }
 
     wxLocale(int language, // wxLanguage id or custom language
              int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)

-        { Init(language, flags); }
+        {
+            DoCommonInit();

 
 

-        // the same as a function (returns TRUE on success)
+            Init(language, flags);
+        }
+
+        // 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 Init(const wxChar *szName,
               const wxChar *szShort = (const wxChar *) NULL,
               const wxChar *szLocale = (const wxChar *) NULL,

-              bool bLoadDefault = TRUE,
-              bool bConvertEncoding = FALSE);
+              bool bLoadDefault = true,
+              bool bConvertEncoding = false);

 
 

-        // same as second ctor (returns TRUE on success)
+        // same as second ctor (returns true on success)

     bool Init(int language = wxLANGUAGE_DEFAULT,
               int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
 
     bool Init(int language = wxLANGUAGE_DEFAULT,
               int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
 


@@ -418,7 +423,7 @@ public:
     // is used, the US default value is returned if everything else fails
     static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat);
 
     // is used, the US default value is returned if everything else fails
     static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat);
 

-    // return TRUE if the locale was set successfully
+    // return true if the locale was set successfully

     bool IsOk() const { return m_pszOldLocale != NULL; }
 
     // returns locale name
     bool IsOk() const { return m_pszOldLocale != NULL; }
 
     // returns locale name


@@ -511,6 +516,9 @@ private:
     // m_langugagesInfo, called by InitLanguagesDB
     static void InitLanguagesDB();
 
     // m_langugagesInfo, called by InitLanguagesDB
     static void InitLanguagesDB();
 

+    // initialize the member fields to default values
+    void DoCommonInit();
+

     wxString       m_strLocale,       // this locale name
                    m_strShort;        // short name for the locale
     int            m_language;        // this locale wxLanguage value
     wxString       m_strLocale,       // this locale name
                    m_strShort;        // short name for the locale
     int            m_language;        // this locale wxLanguage value


@@ -522,6 +530,8 @@ private:
 
     bool           m_bConvertEncoding;
 
 
     bool           m_bConvertEncoding;
 

+    bool           m_initialized;
+

     static wxLanguageInfoArray *ms_languagesDB;
 
     DECLARE_NO_COPY_CLASS(wxLocale)
     static wxLanguageInfoArray *ms_languagesDB;
 
     DECLARE_NO_COPY_CLASS(wxLocale)


@@ -557,10 +567,10 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
 
 // the macros should still be defined - otherwise compilation would fail
 
 
 // the macros should still be defined - otherwise compilation would fail
 

-#if !defined(WXINTL_NO_GETTEXT_MACRO) && !defined(_)
-    #define _(s)            (_T(s))
-    #define _N(s1, s2, n)   ((n) == 1 ? _T(s1) : _T(s2))
-    #define N_(s)           _T(s)
+#if !defined(WXINTL_NO_GETTEXT_MACRO)
+    #if !defined(_)
+        #define _(s)                 (_T(s))
+    #endif

 #endif
 
 #define wxTRANSLATE(str) _T(str)
 #endif
 
 #define wxTRANSLATE(str) _T(str)


@@ -573,8 +583,13 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
 
 // define this one just in case it occurs somewhere (instead of preferred
 // wxTRANSLATE) too
 
 // define this one just in case it occurs somewhere (instead of preferred
 // wxTRANSLATE) too

-#if !defined(WXINTL_NO_GETTEXT_MACRO) && !defined(gettext_noop)
-    #define gettext_noop(str) _T(str)
+#if !defined(WXINTL_NO_GETTEXT_MACRO)
+    #if !defined(gettext_noop)
+        #define gettext_noop(str) _T(str)
+    #endif
+    #if !defined(N_)
+        #define N_(s)             _T(s)
+    #endif

 #endif
 
 #endif // _WX_INTL_H_
 #endif
 
 #endif // _WX_INTL_H_