fixed i18n handling of _ in XRC texts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index 86c25e8d0c0dfdb9d7b293d6251e854fd5d85393..93a0b7f5618296fbb27f2d1cb882420e5f05c1e6 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -494,11 +494,16 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
 
 wxString wxXmlResourceHandler::GetText(const wxString& param)
 {
 
 wxString wxXmlResourceHandler::GetText(const wxString& param)
 {

-    wxString str1 = GetParamValue(param);
+    wxString str1;

     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 
     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 

+    if (m_resource->GetUseLocale())
+        str1 = wxGetTranslation(GetParamValue(param));
+    else
+        str1 = GetParamValue(param);
+

     // VS: First version of XRC resources used $ instead of & (which is illegal in XML),
     //     but later I realized that '_' fits this purpose much better (because
     //     &File means "File with F underlined").
     // VS: First version of XRC resources used $ instead of & (which is illegal in XML),
     //     but later I realized that '_' fits this purpose much better (because
     //     &File means "File with F underlined").


@@ -529,11 +534,8 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
             }
         else str2 << *dt;
     }
             }
         else str2 << *dt;
     }

-
-    if (m_resource->GetUseLocale())
-        return wxGetTranslation(str2);
-    else
-        return str2;
+    
+    return str2;

 }
 
 
 }
 
 

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 86c25e8d0c0dfdb9d7b293d6251e854fd5d85393..93a0b7f5618296fbb27f2d1cb882420e5f05c1e6 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -494,11 +494,16 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
 
 wxString wxXmlResourceHandler::GetText(const wxString& param)
 {
 
 wxString wxXmlResourceHandler::GetText(const wxString& param)
 {

-    wxString str1 = GetParamValue(param);
+    wxString str1;

     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 
     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 

+    if (m_resource->GetUseLocale())
+        str1 = wxGetTranslation(GetParamValue(param));
+    else
+        str1 = GetParamValue(param);
+

     // VS: First version of XRC resources used $ instead of & (which is illegal in XML),
     //     but later I realized that '_' fits this purpose much better (because
     //     &File means "File with F underlined").
     // VS: First version of XRC resources used $ instead of & (which is illegal in XML),
     //     but later I realized that '_' fits this purpose much better (because
     //     &File means "File with F underlined").


@@ -529,11 +534,8 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
             }
         else str2 << *dt;
     }
             }
         else str2 << *dt;
     }

-
-    if (m_resource->GetUseLocale())
-        return wxGetTranslation(str2);
-    else
-        return str2;
+    
+    return str2;

 }
 
 
 }