X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02df379910a86bdde7e81b7f62d890cc314b4554..6edf1107031284fdcf5e6eabc6b87a7367e28185:/src/xrc/xh_combo.cpp?ds=inline

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index 3d708c3a49..03fa009eb4 100644
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -25,6 +25,8 @@
 
 #if wxUSE_COMBOBOX
 
+IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
+
 wxComboBoxXmlHandler::wxComboBoxXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)
 {
@@ -83,7 +85,10 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
-        strList.Add(wxGetTranslation(GetNodeContent(m_node)));
+        wxString str = GetNodeContent(m_node);
+        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+            str = wxGetTranslation(str);
+        strList.Add(str);
 
         return NULL;
     }