X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9366ec4e1e8564cad0745fd727ffe15105e0a495..24aab8e81a8627802e4111d9c99a50ece8d0026e:/src/xrc/xh_odcombo.cpp?ds=sidebyside diff --git a/src/xrc/xh_odcombo.cpp b/src/xrc/xh_odcombo.cpp index ffd08373ef..8f5d6d2705 100644 --- a/src/xrc/xh_odcombo.cpp +++ b/src/xrc/xh_odcombo.cpp @@ -97,7 +97,7 @@ wxObject *wxOwnerDrawnComboBoxXmlHandler::DoCreateResource() // add to the list wxString str = GetNodeContent(m_node); if (m_resource->GetFlags() & wxXRC_USE_LOCALE) - str = wxGetTranslation(str); + str = wxGetTranslation(str, m_resource->GetDomain()); strList.Add(str); return NULL; @@ -106,7 +106,7 @@ wxObject *wxOwnerDrawnComboBoxXmlHandler::DoCreateResource() bool wxOwnerDrawnComboBoxXmlHandler::CanHandle(wxXmlNode *node) { -#if wxABI_VERSION >= 20700 +#if wxCHECK_VERSION(2,7,0) return (IsOfClass(node, wxT("wxOwnerDrawnComboBox")) || (m_insideBox && node->GetName() == wxT("item")));