Really fix the problem with caret in wxGrid text editor under MSW.

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

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index e13a117b5ab6cbde10002419d0c6cbcd1ed84fa1..c8f853a51e9d875f3239231d179a4d930ffca88c 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -25,6 +25,8 @@
     #include "wx/checklst.h"
 #endif
 
     #include "wx/checklst.h"
 #endif
 

+#include "wx/xml/xml.h"
+

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


@@ -44,16 +46,8 @@ 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")));


@@ -80,9 +74,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++;


@@ -112,9 +106,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")));
 }