change wxDataViewItem id to void*

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index ba26a162954ddf12c3c4d4bbbd83a6fca2315331..127c2c15d5263afa1b7f0c961d51f5ca09aefd37 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -54,8 +54,8 @@ enum wxLayoutDirection
 // forward decls
 // ----------------------------------------------------------------------------
 
 // forward decls
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxLocale;
-class WXDLLIMPEXP_BASE wxLanguageInfoArray;
+class WXDLLIMPEXP_FWD_BASE wxLocale;
+class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray;

 class wxMsgCatalog;
 
 // ============================================================================
 class wxMsgCatalog;
 
 // ============================================================================


@@ -512,6 +512,11 @@ public:
                                       size_t n,
                                       const wxString& domain = wxEmptyString) const;
 
                                       size_t n,
                                       const wxString& domain = wxEmptyString) const;
 

+    // this is hack to work around a problem with wxGetTranslation() which
+    // returns const wxString& and not wxString, so when it returns untranslated
+    // string, it needs to have a copy of it somewhere
+    static const wxString& GetUntranslatedString(const wxString& str);
+

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


@@ -540,7 +545,7 @@ private:
                    m_strShort;        // short name for the locale
     int            m_language;        // this locale wxLanguage value
 
                    m_strShort;        // short name for the locale
     int            m_language;        // this locale wxLanguage value
 

-    const wxChar  *m_pszOldLocale;    // previous locale from setlocale()
+    const char  *m_pszOldLocale;      // previous locale from setlocale()

     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


@@ -569,7 +574,9 @@ inline const wxString& wxGetTranslation(const wxString& str,
     if (pLoc)
         return pLoc->GetString(str, domain);
     else
     if (pLoc)
         return pLoc->GetString(str, domain);
     else

-        return str;
+        // NB: this function returns reference to a string, so we have to keep
+        //     a copy of it somewhere
+        return wxLocale::GetUntranslatedString(str);

 }
 inline const wxString& wxGetTranslation(const wxString& str1,
                                         const wxString& str2,
 }
 inline const wxString& wxGetTranslation(const wxString& str1,
                                         const wxString& str2,


@@ -580,7 +587,11 @@ inline const wxString& wxGetTranslation(const wxString& str1,
     if (pLoc)
         return pLoc->GetString(str1, str2, n, domain);
     else
     if (pLoc)
         return pLoc->GetString(str1, str2, n, domain);
     else

-        return n == 1 ? str1 : str2;
+        // NB: this function returns reference to a string, so we have to keep
+        //     a copy of it somewhere
+        return n == 1
+               ? wxLocale::GetUntranslatedString(str1)
+               : wxLocale::GetUntranslatedString(str2);

 }
 
 #else // !wxUSE_INTL
 }
 
 #else // !wxUSE_INTL


@@ -591,15 +602,32 @@ inline const wxString& wxGetTranslation(const wxString& str1,
     #if !defined(_)
         #define _(s)                 (_T(s))
     #endif
     #if !defined(_)
         #define _(s)                 (_T(s))
     #endif

+    #define wxPLURAL(sing, plur, n)  ((n) == 1 ? _T(sing) : _T(plur))

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

-inline const wxString& wxGetTranslation(const wxString& str,
-                                        const wxString& WXUNUSED(domain) = wxEmptyString)
-{
-    return str;
-}
+// NB: we use a template here in order to avoid using
+//     wxLocale::GetUntranslatedString() above, which would be required if
+//     we returned const wxString&; this way, the compiler should be able to
+//     optimize wxGetTranslation() away
+
+template<typename TString>
+inline TString wxGetTranslation(TString str)
+    { return str; }
+
+template<typename TString, typename TDomain>
+inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain))
+    { return str; }
+
+template<typename TString, typename TDomain>
+inline TString wxGetTranslation(TString str1, TString str2, size_t n)
+    { return n == 1 ? str1 : str2; }
+
+template<typename TString, typename TDomain>
+inline TString wxGetTranslation(TString str1, TString str2, size_t n,
+                                TDomain WXUNUSED(domain))
+    { return n == 1 ? str1 : str2; }

 
 #endif // wxUSE_INTL/!wxUSE_INTL
 
 
 #endif // wxUSE_INTL/!wxUSE_INTL