1) some cleanup in wxHtmlWindow, moved private structures out of headers

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

diff --git a/contrib/src/xml/xh_toolb.cpp b/contrib/src/xml/xh_toolb.cpp
index 927642e64155b3cda0f26dc2d9d0bbe042b9b500..87c4d2eb69fbdf3017c1d7586ea3e285290c64b7 100644 (file)
--- a/contrib/src/xml/xh_toolb.cpp
+++ b/contrib/src/xml/xh_toolb.cpp
@@ -38,31 +38,31 @@ wxToolBarXmlHandler::wxToolBarXmlHandler()
 
 wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 
 
 wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 

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

     {
     {

-        wxCHECK_MSG(m_Toolbar, NULL, _T("Incorrect syntax of XML resource: tool not within a toolbar!"));
+        wxCHECK_MSG(m_Toolbar, NULL, wxT("Incorrect syntax of XML resource: tool not within a toolbar!"));

         m_Toolbar->AddTool(GetID(),
         m_Toolbar->AddTool(GetID(),

-                           GetBitmap(_T("bitmap")),
-                           GetBitmap(_T("bitmap2")),
-                           GetBool(_T("toggle")),
+                           GetBitmap(wxT("bitmap")),
+                           GetBitmap(wxT("bitmap2")),
+                           GetBool(wxT("toggle")),

                            GetPosition().x,
                            GetPosition().y,
                            NULL,
                            GetPosition().x,
                            GetPosition().y,
                            NULL,

-                           GetText(_T("tooltip")),
-                           GetText(_T("longhelp")));
+                           GetText(wxT("tooltip")),
+                           GetText(wxT("longhelp")));

         return m_Toolbar; // must return non-NULL
     }
     
         return m_Toolbar; // must return non-NULL
     }
     

-    else if (m_Node->GetName() == _T("separator"))
+    else if (m_Class == wxT("separator"))

     {
     {

-        wxCHECK_MSG(m_Toolbar, NULL, _T("Incorrect syntax of XML resource: separator not within a toolbar!"));
+        wxCHECK_MSG(m_Toolbar, NULL, wxT("Incorrect syntax of XML resource: separator not within a toolbar!"));

         m_Toolbar->AddSeparator();
         return m_Toolbar; // must return non-NULL
     }
     
         m_Toolbar->AddSeparator();
         return m_Toolbar; // must return non-NULL
     }
     

-    else /*<toolbar>*/
+    else /*<object class="wxToolBar">*/

     {
     {

-        int style = GetStyle(_T("style"), wxNO_BORDER | wxTB_HORIZONTAL);
+        int style = GetStyle(wxT("style"), wxNO_BORDER | wxTB_HORIZONTAL);

 #ifdef __WXMSW__
         if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
 #endif
 #ifdef __WXMSW__
         if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
 #endif


@@ -73,35 +73,36 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
                                     style,
                                     GetName());
 
                                     style,
                                     GetName());
 

-        wxSize bmpsize = GetSize(_T("bitmapsize"));
+        wxSize bmpsize = GetSize(wxT("bitmapsize"));

         if (!(bmpsize == wxDefaultSize))
             toolbar->SetToolBitmapSize(bmpsize);
         if (!(bmpsize == wxDefaultSize))
             toolbar->SetToolBitmapSize(bmpsize);

-        wxSize margins = GetSize(_T("margins"));
+        wxSize margins = GetSize(wxT("margins"));

         if (!(margins == wxDefaultSize))
             toolbar->SetMargins(margins.x, margins.y);
         if (!(margins == wxDefaultSize))
             toolbar->SetMargins(margins.x, margins.y);

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

         if (packing != -1)
             toolbar->SetToolPacking(packing);
         if (packing != -1)
             toolbar->SetToolPacking(packing);

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

         if (separation != -1)
             toolbar->SetToolSeparation(separation);
 
         if (separation != -1)
             toolbar->SetToolSeparation(separation);
 

-        wxXmlNode *children_node = GetParamNode(_T("children"));
+        wxXmlNode *children_node = GetParamNode(wxT("object"));

         if (children_node == NULL) return toolbar;
 
         m_IsInside = TRUE;
         m_Toolbar = toolbar;
 
         if (children_node == NULL) return toolbar;
 
         m_IsInside = TRUE;
         m_Toolbar = toolbar;
 

-        wxXmlNode *n = children_node->GetChildren();
+        wxXmlNode *n = children_node;

 
         while (n)
         {
 
         while (n)
         {

-            if (n->GetType() == wxXML_ELEMENT_NODE)
+            if (n->GetType() == wxXML_ELEMENT_NODE && 
+                n->GetName() == wxT("object"))

             {
                 wxObject *created = CreateResFromNode(n, toolbar, NULL);
                 wxControl *control = wxDynamicCast(created, wxControl);
             {
                 wxObject *created = CreateResFromNode(n, toolbar, NULL);
                 wxControl *control = wxDynamicCast(created, wxControl);

-                if (n->GetName() != _T("tool") &&
-                    n->GetName() != _T("separator") &&
+                if (IsOfClass(n, wxT("tool")) &&
+                    IsOfClass(n, wxT("separator")) &&

                     control != NULL)
                     toolbar->AddControl(control);
             }
                     control != NULL)
                     toolbar->AddControl(control);
             }


@@ -120,9 +121,9 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 
 bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
 {
 
 bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return ((!m_IsInside && node->GetName() == _T("toolbar")) ||
-            (m_IsInside && node->GetName() == _T("tool")) || 
-            (m_IsInside && node->GetName() == _T("separator")));
+    return ((!m_IsInside && IsOfClass(node, wxT("wxToolBar"))) ||
+            (m_IsInside && IsOfClass(node, wxT("tool"))) || 
+            (m_IsInside && IsOfClass(node, wxT("separator"))));

 }
 
 #endif
 }
 
 #endif