Fixed layout and hit-testing problem particularly with centred lines

[wxWidgets.git] / src / richtext / richtextxml.cpp

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 9a34fd8894b6f308bfcb85f443f9efd5a765a2cd..fa3ee081c336a4e3fab94bd098cf88975728862e 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -89,6 +89,8 @@ static inline void AddString(wxString& str, const wxColour& col) { str << wxT("#
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
 

+wxStringToStringHashMap wxRichTextXMLHandler::sm_nodeNameToClassMap;
+

 void wxRichTextXMLHandler::Init()
 {
 #if wxRICHTEXT_HAVE_DIRECT_OUTPUT
 void wxRichTextXMLHandler::Init()
 {
 #if wxRICHTEXT_HAVE_DIRECT_OUTPUT


@@ -158,22 +160,12 @@ bool wxRichTextXMLHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& s
 /// Creates an object given an XML element name
 wxRichTextObject* wxRichTextXMLHandler::CreateObjectForXMLName(wxRichTextObject* WXUNUSED(parent), const wxString& name) const
 {
 /// Creates an object given an XML element name
 wxRichTextObject* wxRichTextXMLHandler::CreateObjectForXMLName(wxRichTextObject* WXUNUSED(parent), const wxString& name) const
 {

-    if (name == wxT("text") || name == wxT("symbol"))
-        return new wxRichTextPlainText;
-    else if (name == wxT("image"))
-        return new wxRichTextImage;
-    else if (name == wxT("paragraph"))
-        return new wxRichTextParagraph;
-    else if (name == wxT("paragraphlayout"))
-        return new wxRichTextParagraphLayoutBox;
-    else if (name == wxT("textbox"))
-        return new wxRichTextBox;
-    else if (name == wxT("cell"))
-        return new wxRichTextCell;
-    else if (name == wxT("table"))
-        return new wxRichTextTable;
-    else
+    // The standard node to class mappings are added in wxRichTextModule::OnInit in richtextbuffer.cpp
+    wxStringToStringHashMap::const_iterator it = sm_nodeNameToClassMap.find(name);
+    if (it == sm_nodeNameToClassMap.end())

         return NULL;
         return NULL;

+    else
+        return wxDynamicCast(wxCreateDynamicObject(it->second), wxRichTextObject);

 }
 
 /// Recursively import an object
 }
 
 /// Recursively import an object


@@ -207,6 +199,11 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxRichTextObject*
 }
 
 bool wxRichTextXMLHandler::ImportProperties(wxRichTextObject* obj, wxXmlNode* node)
 }
 
 bool wxRichTextXMLHandler::ImportProperties(wxRichTextObject* obj, wxXmlNode* node)

+{
+    return ImportProperties(obj->GetProperties(), node);
+}
+
+bool wxRichTextXMLHandler::ImportProperties(wxRichTextProperties& properties, wxXmlNode* node)

 {
     wxXmlNode* child = node->GetChildren();
     while (child)
 {
     wxXmlNode* child = node->GetChildren();
     while (child)


@@ -225,7 +222,7 @@ bool wxRichTextXMLHandler::ImportProperties(wxRichTextObject* obj, wxXmlNode* no
                     wxVariant var = MakePropertyFromString(name, value, type);
                     if (!var.IsNull())
                     {
                     wxVariant var = MakePropertyFromString(name, value, type);
                     if (!var.IsNull())
                     {

-                        obj->GetProperties().SetProperty(var);
+                        properties.SetProperty(var);

                     }
                 }
                 propertyChild = propertyChild->GetNext();
                     }
                 }
                 propertyChild = propertyChild->GetNext();


@@ -262,6 +259,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
             child = child->GetNext();
         }
 
             child = child->GetNext();
         }
 

+        ImportProperties(def->GetProperties(), node);
+

         sheet->AddCharacterStyle(def);
     }
     else if (styleType == wxT("paragraphstyle"))
         sheet->AddCharacterStyle(def);
     }
     else if (styleType == wxT("paragraphstyle"))


@@ -284,6 +283,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
             child = child->GetNext();
         }
 
             child = child->GetNext();
         }
 

+        ImportProperties(def->GetProperties(), node);
+

         sheet->AddParagraphStyle(def);
     }
     else if (styleType == wxT("boxstyle"))
         sheet->AddParagraphStyle(def);
     }
     else if (styleType == wxT("boxstyle"))


@@ -304,6 +305,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
             child = child->GetNext();
         }
 
             child = child->GetNext();
         }
 

+        ImportProperties(def->GetProperties(), node);
+

         sheet->AddBoxStyle(def);
     }
     else if (styleType == wxT("liststyle"))
         sheet->AddBoxStyle(def);
     }
     else if (styleType == wxT("liststyle"))


@@ -339,6 +342,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
             child = child->GetNext();
         }
 
             child = child->GetNext();
         }
 

+        ImportProperties(def->GetProperties(), node);
+

         sheet->AddListStyle(def);
     }
 
         sheet->AddListStyle(def);
     }
 


@@ -835,6 +840,8 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
             wxRichTextBoxStyleDefinition* def = buffer->GetStyleSheet()->GetBoxStyle(i);
             ExportStyleDefinition(styleSheetNode, def);
         }
             wxRichTextBoxStyleDefinition* def = buffer->GetStyleSheet()->GetBoxStyle(i);
             ExportStyleDefinition(styleSheetNode, def);
         }

+
+        WriteProperties(styleSheetNode, buffer->GetStyleSheet()->GetProperties());

     }
     bool success = ExportXML(rootNode, *buffer);
 #if wxRICHTEXT_USE_OUTPUT_TIMINGS
     }
     bool success = ExportXML(rootNode, *buffer);
 #if wxRICHTEXT_USE_OUTPUT_TIMINGS


@@ -910,6 +917,8 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
             ExportStyleDefinition(stream, def, level + 1);
         }
 
             ExportStyleDefinition(stream, def, level + 1);
         }
 

+        WriteProperties(stream, buffer->GetStyleSheet()->GetProperties(), level);
+

         OutputIndentation(stream, level);
         OutputString(stream, wxT("</stylesheet>"));
     }
         OutputIndentation(stream, level);
         OutputString(stream, wxT("</stylesheet>"));
     }


@@ -1068,6 +1077,7 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxRichT
         OutputString(stream, wxT("</boxstyle>"));
     }
 
         OutputString(stream, wxT("</boxstyle>"));
     }
 

+    WriteProperties(stream, def->GetProperties(), level);

 
     return true;
 }
 
     return true;
 }


@@ -1162,6 +1172,9 @@ wxString wxRichTextXMLHandler::AddAttributes(const wxRichTextAttr& attr, bool is
         if (!attr.GetListStyleName().empty())
             AddAttribute(str, wxT("liststyle"), AttributeToXML(attr.GetListStyleName()));
 
         if (!attr.GetListStyleName().empty())
             AddAttribute(str, wxT("liststyle"), AttributeToXML(attr.GetListStyleName()));
 

+        if (!attr.GetTextBoxAttr().GetBoxStyleName().empty())
+            AddAttribute(str, wxT("boxstyle"), AttributeToXML(attr.GetTextBoxAttr().GetBoxStyleName()));
+

         if (attr.HasTabs())
         {
             wxString strTabs;
         if (attr.HasTabs())
         {
             wxString strTabs;


@@ -1190,6 +1203,10 @@ wxString wxRichTextXMLHandler::AddAttributes(const wxRichTextAttr& attr, bool is
     AddAttribute(str, wxT("outline"), attr.GetTextBoxAttr().GetOutline());
     AddAttribute(str, wxT("width"), attr.GetTextBoxAttr().GetWidth());
     AddAttribute(str, wxT("height"), attr.GetTextBoxAttr().GetHeight());
     AddAttribute(str, wxT("outline"), attr.GetTextBoxAttr().GetOutline());
     AddAttribute(str, wxT("width"), attr.GetTextBoxAttr().GetWidth());
     AddAttribute(str, wxT("height"), attr.GetTextBoxAttr().GetHeight());

+    AddAttribute(str, wxT("minwidth"), attr.GetTextBoxAttr().GetMinSize().GetWidth());
+    AddAttribute(str, wxT("minheight"), attr.GetTextBoxAttr().GetMinSize().GetHeight());
+    AddAttribute(str, wxT("maxwidth"), attr.GetTextBoxAttr().GetMaxSize().GetWidth());
+    AddAttribute(str, wxT("maxheight"), attr.GetTextBoxAttr().GetMaxSize().GetHeight());

 
     if (attr.GetTextBoxAttr().HasVerticalAlignment())
     {
 
     if (attr.GetTextBoxAttr().HasVerticalAlignment())
     {


@@ -1259,7 +1276,7 @@ bool wxRichTextXMLHandler::WriteProperties(wxOutputStream& stream, const wxRichT
         level ++;
 
         OutputIndentation(stream, level);
         level ++;
 
         OutputIndentation(stream, level);

-        OutputString(stream, wxT("<properties"));
+        OutputString(stream, wxT("<properties>"));

 
         level ++;
 
 
         level ++;
 


@@ -1276,14 +1293,14 @@ bool wxRichTextXMLHandler::WriteProperties(wxOutputStream& stream, const wxRichT
                 OutputString(stream, wxT("<property name=\"") + name +
                     wxT("\" type=\"") + var.GetType() + wxT("\" value=\""));
                 OutputStringEnt(stream, value);
                 OutputString(stream, wxT("<property name=\"") + name +
                     wxT("\" type=\"") + var.GetType() + wxT("\" value=\""));
                 OutputStringEnt(stream, value);

-                OutputString(stream, wxT("\"/>\n"));
+                OutputString(stream, wxT("\"/>"));

             }
         }
 
         level --;
 
         OutputIndentation(stream, level);
             }
         }
 
         level --;
 
         OutputIndentation(stream, level);

-        OutputString(stream, wxT("</properties>\n"));
+        OutputString(stream, wxT("</properties>"));

 
         level --;
     }
 
         level --;
     }


@@ -1366,6 +1383,8 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxXmlNode* parent, wxRichTextSt
         AddAttributes(styleNode, def->GetStyle(), true);
     }
 
         AddAttributes(styleNode, def->GetStyle(), true);
     }
 

+    WriteProperties(defNode, def->GetProperties());
+

     return true;
 }
 
     return true;
 }
 


@@ -1451,6 +1470,9 @@ bool wxRichTextXMLHandler::AddAttributes(wxXmlNode* node, wxRichTextAttr& attr,
         if (!attr.GetListStyleName().empty())
             node->AddAttribute(wxT("liststyle"), attr.GetListStyleName());
 
         if (!attr.GetListStyleName().empty())
             node->AddAttribute(wxT("liststyle"), attr.GetListStyleName());
 

+        if (!attr.GetTextBoxAttr().GetBoxStyleName().empty())
+            node->AddAttribute(wxT("boxstyle"), attr.GetTextBoxAttr().GetBoxStyleName());
+

         if (attr.HasTabs())
         {
             wxString tabs;
         if (attr.HasTabs())
         {
             wxString tabs;


@@ -1478,6 +1500,10 @@ bool wxRichTextXMLHandler::AddAttributes(wxXmlNode* node, wxRichTextAttr& attr,
     AddAttribute(node, wxT("outline"), attr.GetTextBoxAttr().GetOutline());
     AddAttribute(node, wxT("width"), attr.GetTextBoxAttr().GetWidth());
     AddAttribute(node, wxT("height"), attr.GetTextBoxAttr().GetHeight());
     AddAttribute(node, wxT("outline"), attr.GetTextBoxAttr().GetOutline());
     AddAttribute(node, wxT("width"), attr.GetTextBoxAttr().GetWidth());
     AddAttribute(node, wxT("height"), attr.GetTextBoxAttr().GetHeight());

+    AddAttribute(node, wxT("minwidth"), attr.GetTextBoxAttr().GetMinSize().GetWidth());
+    AddAttribute(node, wxT("minheight"), attr.GetTextBoxAttr().GetMinSize().GetHeight());
+    AddAttribute(node, wxT("maxwidth"), attr.GetTextBoxAttr().GetMaxSize().GetWidth());
+    AddAttribute(node, wxT("maxheight"), attr.GetTextBoxAttr().GetMaxSize().GetHeight());

 
     if (attr.GetTextBoxAttr().HasVerticalAlignment())
     {
 
     if (attr.GetTextBoxAttr().HasVerticalAlignment())
     {


@@ -1804,6 +1830,13 @@ bool wxRichTextXMLHandler::ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, bo
                     attr.SetListStyleName(value);
                 }
             }
                     attr.SetListStyleName(value);
                 }
             }

+            else if (name == wxT("boxstyle"))
+            {
+                if (!value.empty())
+                {
+                    attr.GetTextBoxAttr().SetBoxStyleName(value);
+                }
+            }

             else if (name == wxT("tabs"))
             {
                 if (!value.empty())
             else if (name == wxT("tabs"))
             {
                 if (!value.empty())


@@ -1850,6 +1883,22 @@ bool wxRichTextXMLHandler::ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, bo
             {
                 attr.GetTextBoxAttr().GetHeight().SetValue(wxRichTextParseDimension(value));
             }
             {
                 attr.GetTextBoxAttr().GetHeight().SetValue(wxRichTextParseDimension(value));
             }

+            else if (name == wxT("minwidth"))
+            {
+                attr.GetTextBoxAttr().GetMinSize().GetWidth().SetValue(wxRichTextParseDimension(value));
+            }
+            else if (name == wxT("minheight"))
+            {
+                attr.GetTextBoxAttr().GetMinSize().GetHeight().SetValue(wxRichTextParseDimension(value));
+            }
+            else if (name == wxT("maxwidth"))
+            {
+                attr.GetTextBoxAttr().GetMaxSize().GetWidth().SetValue(wxRichTextParseDimension(value));
+            }
+            else if (name == wxT("maxheight"))
+            {
+                attr.GetTextBoxAttr().GetMaxSize().GetHeight().SetValue(wxRichTextParseDimension(value));
+            }

 
             else if (name == wxT("verticalalignment"))
             {
 
             else if (name == wxT("verticalalignment"))
             {


@@ -2495,6 +2544,7 @@ bool wxRichTextParagraphLayoutBox::ImportFromXML(wxRichTextBuffer* buffer, wxXml
 
             child2 = child2->GetNext();
         }
 
             child2 = child2->GetNext();
         }

+        handler->ImportProperties(sheet->GetProperties(), child);

 
         // Notify that styles have changed. If this is vetoed by the app,
         // the new sheet will be deleted. If it is not vetoed, the
 
         // Notify that styles have changed. If this is vetoed by the app,
         // the new sheet will be deleted. If it is not vetoed, the