use wxCoord with GetTextExtent(), not long (the long overloads are deprecated and...

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index f8129005d8f1a8e2366da9ca88f6b4502dc373c3..dec5ce8daaedf08cf87d17680259908d2faab59e 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -69,6 +69,7 @@
 #include "wx/ptr_scpd.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
+#include "wx/hashset.h"
 
 #if defined(__WXMAC__)
     #include  "wx/mac/private.h"  // includes mac headers
@@ -2614,7 +2615,7 @@ const wxString& wxLocale::GetString(const wxString& origString,
                                     const wxString& domain) const
 {
     if ( origString.empty() )
-        return origString;
+        return GetUntranslatedString(origString);
 
     const wxString *trans = NULL;
     wxMsgCatalog *pMsgCat;
@@ -2656,14 +2657,31 @@ const wxString& wxLocale::GetString(const wxString& origString,
 #endif // __WXDEBUG__
 
         if (n == size_t(-1))
-            return origString;
+            return GetUntranslatedString(origString);
         else
-            return n == 1 ? origString : origString2;
+            return GetUntranslatedString(n == 1 ? origString : origString2);
     }
 
     return *trans;
 }
 
+WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual,
+                    wxLocaleUntranslatedStrings);
+
+/* static */
+const wxString& wxLocale::GetUntranslatedString(const wxString& str)
+{
+    static wxLocaleUntranslatedStrings s_strings;
+
+    wxLocaleUntranslatedStrings::iterator i = s_strings.find(str);
+    if ( i != s_strings.end() )
+        return *i;
+    else
+        return *s_strings.insert(str).first;
+
+    return *i;
+}
+
 wxString wxLocale::GetHeaderValue(const wxString& header,
                                   const wxString& domain) const
 {