don't translate accelerators in XRC menus

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

diff --git a/contrib/include/wx/xrc/xmlres.h b/contrib/include/wx/xrc/xmlres.h
index 77bc74433e783f9d2101927fa758068ff91af2db..779dd670c5238548dd64e6202491b79520018da2 100644 (file)
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -344,9 +344,9 @@ protected:
 
     // Gets text from param and does some conversions:
     // - replaces \n, \r, \t by respective chars (according to C syntax)
-    // - replaces $ by & and $$ by $ (needed for $File => &File because of XML)
+    // - replaces _ by & and __ by _ (needed for _File => &File because of XML)
     // - calls wxGetTranslations (unless disabled in wxXmlResource)
-    wxString GetText(const wxString& param);
+    wxString GetText(const wxString& param, bool translate = TRUE);
 
     // Returns the XRCID.
     int GetID();

diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp
index 93d93e08921e10f0e29ccd3036d43745e037ef67..bfa9ed1644115a56362e904d24186e7bc642a524 100644 (file)
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -69,7 +69,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             int id = GetID();
             bool checkable = GetBool(wxT("checkable"));
             wxString label = GetText(wxT("label"));
-            wxString accel = GetText(wxT("accel"));
+            wxString accel = GetText(wxT("accel"), FALSE);
             wxString fullLabel = label;
             if (!accel.IsEmpty())
                 fullLabel << wxT("\t") << accel;

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index bd45b371852f511a889089724eac878cd1d1e5e5..8a630df247f49595afa36930e8d284bfbb10146c 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -631,14 +631,14 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
 
 
 
-wxString wxXmlResourceHandler::GetText(const wxString& param)
+wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
 {
     wxString str1;
     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 
-    if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+    if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE)
         str1 = wxGetTranslation(GetParamValue(param));
     else
         str1 = GetParamValue(param);

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 77bc74433e783f9d2101927fa758068ff91af2db..779dd670c5238548dd64e6202491b79520018da2 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -344,9 +344,9 @@ protected:
 
     // Gets text from param and does some conversions:
     // - replaces \n, \r, \t by respective chars (according to C syntax)
-    // - replaces $ by & and $$ by $ (needed for $File => &File because of XML)
+    // - replaces _ by & and __ by _ (needed for _File => &File because of XML)
     // - calls wxGetTranslations (unless disabled in wxXmlResource)
-    wxString GetText(const wxString& param);
+    wxString GetText(const wxString& param, bool translate = TRUE);
 
     // Returns the XRCID.
     int GetID();

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 93d93e08921e10f0e29ccd3036d43745e037ef67..bfa9ed1644115a56362e904d24186e7bc642a524 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -69,7 +69,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             int id = GetID();
             bool checkable = GetBool(wxT("checkable"));
             wxString label = GetText(wxT("label"));
-            wxString accel = GetText(wxT("accel"));
+            wxString accel = GetText(wxT("accel"), FALSE);
             wxString fullLabel = label;
             if (!accel.IsEmpty())
                 fullLabel << wxT("\t") << accel;

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index bd45b371852f511a889089724eac878cd1d1e5e5..8a630df247f49595afa36930e8d284bfbb10146c 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -631,14 +631,14 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
 
 
 
-wxString wxXmlResourceHandler::GetText(const wxString& param)
+wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
 {
     wxString str1;
     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 
-    if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+    if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE)
         str1 = wxGetTranslation(GetParamValue(param));
     else
         str1 = GetParamValue(param);