Various compilation fixes.

[wxWidgets.git] / src / xrc / xh_chckl.cpp

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index c72b37c77ac2ef6ffc1cdc15a6cd98fd79492cd3..a633b112a9a62498f88981f61d52784099862470 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_chckl.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_chckl.cpp

-// Purpose:     XRC resource for wxCheckList
+// Purpose:     XRC resource for wxCheckListBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$


@@ -21,11 +21,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"
+    #include "wx/checklst.h"

 #endif
 
 #endif
 

-#include "wx/checklst.h"
-#include "wx/log.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 
 wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 
 wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()


@@ -45,42 +44,26 @@ wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
 
 wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 {
 
 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")));
         // 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(),
 
         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"));
                         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)
         {
         int i = 0;
         while (n)
         {


@@ -89,9 +72,9 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
                { n = n->GetNext(); continue; }
 
             // checking boolean is a bit ugly here (see GetBool() )
                { 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();
             v.MakeLower();

-            if (v && v == wxT("1"))
+            if (v == wxT("1"))

                 control->Check( i, true );
 
             i++;
                 control->Check( i, true );
 
             i++;


@@ -100,8 +83,6 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 
         SetupWindow(control);
 
 
         SetupWindow(control);
 

-        if (strings != NULL)
-            delete[] strings;

         strList.Clear();    // dump the strings
 
         return control;
         strList.Clear();    // dump the strings
 
         return control;


@@ -114,7 +95,7 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
         // add to the list
         wxString str = GetNodeContent(m_node);
         if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
         // 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;
     }
         strList.Add(str);
         return NULL;
     }


@@ -123,9 +104,6 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxCheckListBox")) ||
 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")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }