X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02df379910a86bdde7e81b7f62d890cc314b4554..c74caa095c12410bd6a555df248699cb35821a8d:/contrib/src/xrc/xh_chckl.cpp

diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp
index 24e191e830..522612a264 100644
--- a/contrib/src/xrc/xh_chckl.cpp
+++ b/contrib/src/xrc/xh_chckl.cpp
@@ -19,21 +19,34 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
 #include "wx/intl.h"
+#include "wx/log.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 
-wxCheckListXmlHandler::wxCheckListXmlHandler() 
+wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler() 
 : wxXmlResourceHandler(), m_insideBox(FALSE)
 {
     // no styles
     AddWindowStyles();
 }
 
-wxObject *wxCheckListXmlHandler::DoCreateResource()
+wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 { 
-    if (m_class == wxT("wxCheckList"))
+    if (m_class == wxT("wxCheckListBox")
+#if WXWIN_COMPATIBILITY_2_4
+        || m_class == wxT("wxCheckList")
+#endif
+       )
     {
+#if WXWIN_COMPATIBILITY_2_4
+        if (m_class == wxT("wxCheckList"))
+            wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
+#endif
         // need to build the list of strings from children
         m_insideBox = TRUE;
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
@@ -91,15 +104,22 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         // handle <item checked="boolean">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;
     }
 }
 
-bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
+bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return (IsOfClass(node, wxT("wxCheckList")) ||
+    return (IsOfClass(node, wxT("wxCheckListBox")) ||
+#if WXWIN_COMPATIBILITY_2_4
+            IsOfClass(node, wxT("wxCheckList")) ||
+#endif
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
+#endif