removed libxpm dependencies from makefiles

[wxWidgets.git] / contrib / src / xml / xh_listb.cpp

diff --git a/contrib/src/xml/xh_listb.cpp b/contrib/src/xml/xh_listb.cpp
index d9d2a54089473b4d822925ef6e9732540c3b1d87..064e43b9adb22ccc8f86bc97c947075470cd4799 100644 (file)
--- a/contrib/src/xml/xh_listb.cpp
+++ b/contrib/src/xml/xh_listb.cpp
@@ -23,7 +23,7 @@
 #include "wx/listbox.h"
 
 wxListBoxXmlHandler::wxListBoxXmlHandler() 
-: wxXmlResourceHandler() , m_InsideBox(FALSE)
+: wxXmlResourceHandler() , m_insideBox(FALSE)
 {
     ADD_STYLE(wxLB_SINGLE);
     ADD_STYLE(wxLB_MULTIPLE);
@@ -32,19 +32,19 @@ wxListBoxXmlHandler::wxListBoxXmlHandler()
     ADD_STYLE(wxLB_ALWAYS_SB);
     ADD_STYLE(wxLB_NEEDED_SB);
     ADD_STYLE(wxLB_SORT);
+    AddWindowStyles();
 }
 
 wxObject *wxListBoxXmlHandler::DoCreateResource()
 { 
-    if( m_Node->GetName() == _T("listbox"))
+    if( m_class == wxT("wxListBox"))
     {
         // find the selection
-        long selection = GetLong( _T("selection"), -1 );
+        long selection = GetLong( wxT("selection"), -1 );
 
         // need to build the list of strings from children
-        m_InsideBox = TRUE;
-        CreateChildren( NULL, TRUE /* only this handler */, 
-                        GetParamNode(_T("content")));
+        m_insideBox = TRUE;
+        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
@@ -55,7 +55,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
         }
 
 
-        wxListBox *control = new wxListBox(m_ParentAsWindow,
+        wxListBox *control = new wxListBox(m_parentAsWindow,
                                     GetID(),
                                     GetPosition(), GetSize(),
                                     strList.GetCount(),
@@ -82,7 +82,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
         
         // add to the list
-        strList.Add( GetNodeContent(m_Node) );
+        strList.Add( GetNodeContent(m_node) );
 
         return NULL;
     }
@@ -93,10 +93,9 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
 
 bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return( node->GetName() == _T("listbox") ||
-        ( m_InsideBox &&
-            node->GetName() == _T("item" )) 
-        );
+    return (IsOfClass(node, wxT("wxListBox")) ||
+           (m_insideBox && node->GetName() == wxT("item"))
+           );
 }