X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/603f702b4a0e19ffa27cffc52872efaac1aa8c54..5cef2f6505126d03e675e3288bc9dffcb37184a3:/src/richtext/richtextxml.cpp?ds=inline

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 5f2f84cbe9..de049434c7 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -169,9 +169,9 @@ wxRichTextObject* wxRichTextXMLHandler::CreateObjectForXMLName(wxRichTextObject*
     else if (name == wxT("textbox"))
         return new wxRichTextBox;
     else if (name == wxT("cell"))
-        return new wxRichTextBox;
+        return new wxRichTextCell;
     else if (name == wxT("table"))
-        return new wxRichTextBox;
+        return new wxRichTextTable;
     else
         return NULL;
 }
@@ -411,6 +411,7 @@ wxXmlNode* wxRichTextXMLHandler::FindNode(wxXmlNode* node, const wxString& name)
     {
         if (child->GetName() == name)
             return child;
+        child = child->GetNext();
     }
     return NULL;
 }
@@ -1199,9 +1200,9 @@ wxString wxRichTextXMLHandler::AddAttributes(const wxRichTextAttr& attr, bool is
         wxString value;
         if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_LEFT)
             value = wxT("left");
-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)
             value = wxT("right");
-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)
             value = wxT("both");
         else
             value = wxT("none");
@@ -1473,9 +1474,9 @@ bool wxRichTextXMLHandler::AddAttributes(wxXmlNode* node, wxRichTextAttr& attr,
         wxString value;
         if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_LEFT)
             value = wxT("left");
-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)
             value = wxT("right");
-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)
             value = wxT("both");
         else
             value = wxT("none");
@@ -1945,7 +1946,7 @@ bool wxRichTextObject::ImportFromXML(wxRichTextBuffer* WXUNUSED(buffer), wxXmlNo
     handler->ImportProperties(this, node);
     handler->ImportStyle(GetAttributes(), node, UsesParagraphAttributes());
     
-    *recurse = false;
+    *recurse = true;
 
     return true;
 }