X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db679b8c836e69c111cdc31e62cf92cebe4f938f..82e8b0ad6c74e1bc6cf534348304e82beb898ecf:/src/xrc/xh_chckl.cpp

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index d7e5226486..c8f853a51e 100644
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_chckl.cpp
-// Purpose:     XRC resource for wxCheckList
+// Name:        src/xrc/xh_chckl.cpp
+// Purpose:     XRC resource for wxCheckListBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_chckl.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,14 +15,17 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
-
-#if wxUSE_CHECKLISTBOX
+#if wxUSE_XRC && wxUSE_CHECKLISTBOX
 
 #include "wx/xrc/xh_chckl.h"
-#include "wx/checklst.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/checklst.h"
+#endif
+
+#include "wx/xml/xml.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 
@@ -41,48 +40,32 @@ wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
     XRC_ADD_STYLE(wxLB_ALWAYS_SB);
     XRC_ADD_STYLE(wxLB_NEEDED_SB);
     XRC_ADD_STYLE(wxLB_SORT);
-    
+
     AddWindowStyles();
 }
 
 wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 {
-    if (m_class == wxT("wxCheckListBox")
-#if WXWIN_COMPATIBILITY_2_4
-        || m_class == wxT("wxCheckList")
-#endif
-       )
+    if (m_class == wxT("wxCheckListBox"))
     {
-#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")));
-        wxString *strings = (wxString *) NULL;
-        if (strList.GetCount() > 0)
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for(int i = 0; i < count; i++)
-                strings[i] = strList[i];
-        }
 
         XRC_MAKE_INSTANCE(control, wxCheckListBox)
 
         control->Create(m_parentAsWindow,
                         GetID(),
                         GetPosition(), GetSize(),
-                        strList.GetCount(),
-                        strings,
+                        strList,
                         GetStyle(),
                         wxDefaultValidator,
                         GetName());
 
         // step through children myself (again.)
         wxXmlNode *n = GetParamNode(wxT("content"));
-        if (n) n = n->GetChildren();
+        if (n)
+            n = n->GetChildren();
         int i = 0;
         while (n)
         {
@@ -91,9 +74,9 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
                { n = n->GetNext(); continue; }
 
             // checking boolean is a bit ugly here (see GetBool() )
-            wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
+            wxString v = n->GetAttribute(wxT("checked"), wxEmptyString);
             v.MakeLower();
-            if (v && v == wxT("1"))
+            if (v == wxT("1"))
                 control->Check( i, true );
 
             i++;
@@ -102,8 +85,6 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 
         SetupWindow(control);
 
-        if (strings != NULL)
-            delete[] strings;
         strList.Clear();    // dump the strings
 
         return control;
@@ -116,7 +97,7 @@ wxObject *wxCheckListBoxXmlHandler::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;
     }
@@ -125,12 +106,7 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxCheckListBox")) ||
-#if WXWIN_COMPATIBILITY_2_4
-            IsOfClass(node, wxT("wxCheckList")) ||
-#endif
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_CHECKLISTBOX
-
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_CHECKLISTBOX