test for bug with new wu-ftpd

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

diff --git a/contrib/src/xml/xh_notbk.cpp b/contrib/src/xml/xh_notbk.cpp
index deaf745f1a8ec4cfa5f4d662bc63740f39bebde6..fa8bec1b823d03b8f737ec4a437edff7c7551bdc 100644 (file)
--- a/contrib/src/xml/xh_notbk.cpp
+++ b/contrib/src/xml/xh_notbk.cpp
@@ -34,36 +34,37 @@ wxNotebookXmlHandler::wxNotebookXmlHandler()
     ADD_STYLE(wxNB_LEFT);
     ADD_STYLE(wxNB_RIGHT);
     ADD_STYLE(wxNB_BOTTOM);
     ADD_STYLE(wxNB_LEFT);
     ADD_STYLE(wxNB_RIGHT);
     ADD_STYLE(wxNB_BOTTOM);

+    AddWindowStyles();

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

-    if (m_Node->GetName() == _T("notebookpage"))
+    if (m_Class == _T("notebookpage"))

     {
     {

-        wxXmlNode *n = GetParamNode(_T("window"))->GetChildren();
-        while (n)
+        wxXmlNode *n = GetParamNode(_T("object"));
+
+        if (n)
+        {
+            bool old_ins = m_IsInside;
+            m_IsInside = FALSE;
+            m_IsInside = old_ins;
+            wxObject *item = CreateResFromNode(n, m_Notebook, NULL);
+            wxWindow *wnd = wxDynamicCast(item, wxWindow);
+
+            if (wnd)
+                m_Notebook->AddPage(wnd, GetText(_T("label")),
+                                         GetBool(_T("selected"), 0));
+            else 
+                wxLogError(_T("Error in resource."));              
+            return wnd;
+        }
+        else

         {
         {

-            if (n->GetType() == wxXML_ELEMENT_NODE)
-            {
-                bool old_ins = m_IsInside;
-                m_IsInside = FALSE;
-                m_IsInside = old_ins;
-                wxObject *item = CreateResFromNode(n, m_Notebook, NULL);
-                wxWindow *wnd = wxDynamicCast(item, wxWindow);
-                
-                if (wnd)
-                    m_Notebook->AddPage(wnd, GetText(_T("label")),
-                                             GetBool(_T("selected"), 0));
-                else 
-                    wxLogError(_T("Error in resource."));              
-                return wnd;
-            }
-            n = n->GetNext();
+            wxLogError(_T("Error in resource: no control within notebook's <page> tag."));
+            return NULL;

         }
         }

-        wxLogError(_T("Error in resource: no control within notebook's <page> tag."));
-        return NULL;

     }
     
     else {
     }
     
     else {


@@ -92,8 +93,8 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
 
 bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
 {
 
 bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return ((!m_IsInside && node->GetName() == _T("notebook")) ||
-            (m_IsInside && node->GetName() == _T("notebookpage")));
+    return ((!m_IsInside && IsOfClass(node, _T("wxNotebook"))) ||
+            (m_IsInside && IsOfClass(node, _T("notebookpage"))));

 }
 
 #endif
 }
 
 #endif