removed libxpm dependencies from makefiles

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

diff --git a/contrib/src/xml/xh_choic.cpp b/contrib/src/xml/xh_choic.cpp
index ea39ffb94b65b230b17866d75199e42005b134a2..a7843e91b7aaaf12a79b665fd87c8a01759be0db 100644 (file)
--- a/contrib/src/xml/xh_choic.cpp
+++ b/contrib/src/xml/xh_choic.cpp
@@ -23,21 +23,22 @@
 #include "wx/choice.h"
 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 
 #include "wx/choice.h"
 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 

-: wxXmlResourceHandler() , m_InsideBox(FALSE)
+: wxXmlResourceHandler() , m_insideBox(FALSE)

 {
     ADD_STYLE(wxCB_SORT);
 {
     ADD_STYLE(wxCB_SORT);

+    AddWindowStyles();

 }
 
 wxObject *wxChoiceXmlHandler::DoCreateResource()
 { 
 }
 
 wxObject *wxChoiceXmlHandler::DoCreateResource()
 { 

-    if( m_Node->GetName() == _T("choice"))
+    if( m_class == wxT("wxChoice"))

     {
         // find the selection
     {
         // find the selection

-        long selection = GetLong( _T("selection"), -1 );
+        long selection = GetLong( wxT("selection"), -1 );

 
         // need to build the list of strings from children
 
         // need to build the list of strings from children

-        m_InsideBox = TRUE;
-        CreateChildren( NULL, TRUE /* only this handler */);
+        m_insideBox = TRUE;
+        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));

         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {


@@ -48,7 +49,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
         }
 
 
         }
 
 

-        wxChoice *control = new wxChoice(m_ParentAsWindow,
+        wxChoice *control = new wxChoice(m_parentAsWindow,

                                     GetID(),
                                     GetPosition(), GetSize(),
                                     strList.GetCount(),
                                     GetID(),
                                     GetPosition(), GetSize(),
                                     strList.GetCount(),


@@ -75,7 +76,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
         // handle <item>Label</item>
         
         // add to the list
         // handle <item>Label</item>
         
         // add to the list

-        strList.Add( GetNodeContent(m_Node) );
+        strList.Add( GetNodeContent(m_node) );

 
         return NULL;
     }
 
         return NULL;
     }


@@ -86,10 +87,9 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
 
 bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
 {
 
 bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return( node->GetName() == _T("choice") ||
-        ( m_InsideBox &&
-            node->GetName() == _T("item" )) 
-        );
+    return (IsOfClass(node, wxT("wxChoice")) ||
+           (m_insideBox && node->GetName() == wxT("item"))
+           );

 }
 
 
 }