Fix wrong tab order in wxAuiNotebook after dragging.

[wxWidgets.git] / include / wx / richtext / richtextxml.h

diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h
index baf52c79a20575b0c10651ed95d3ace1a6c92a46..14ce5236d821a9b47fccbd097fea1424427fc22a 100644 (file)
--- a/include/wx/richtext/richtextxml.h
+++ b/include/wx/richtext/richtextxml.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/richtext/richeditxml.h
+// Name:        wx/richtext/richtextxml.h

 // Purpose:     XML and HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     XML and HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
 // Modified by:


@@ -16,6 +16,7 @@
  * Includes
  */
 
  * Includes
  */
 

+#include "wx/hashmap.h"

 #include "wx/richtext/richtextbuffer.h"
 #include "wx/richtext/richtextstyles.h"
 
 #include "wx/richtext/richtextbuffer.h"
 #include "wx/richtext/richtextstyles.h"
 


@@ -30,12 +31,12 @@ class WXDLLIMPEXP_FWD_XML wxXmlDocument;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler
 {
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler
 {

-    DECLARE_CLASS(wxRichTextXMLHandler)
+    DECLARE_DYNAMIC_CLASS(wxRichTextXMLHandler)

 public:
     wxRichTextXMLHandler(const wxString& name = wxT("XML"), const wxString& ext = wxT("xml"), int type = wxRICHTEXT_TYPE_XML)
         : wxRichTextFileHandler(name, ext, type)
         { Init(); }
 public:
     wxRichTextXMLHandler(const wxString& name = wxT("XML"), const wxString& ext = wxT("xml"), int type = wxRICHTEXT_TYPE_XML)
         : wxRichTextFileHandler(name, ext, type)
         { Init(); }

-        
+

     void Init();
 
 #if wxUSE_STREAMS
     void Init();
 
 #if wxUSE_STREAMS


@@ -69,6 +70,7 @@ public:
     bool ImportXML(wxRichTextBuffer* buffer, wxRichTextObject* obj, wxXmlNode* node);
     bool ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node);
     bool ImportProperties(wxRichTextObject* obj, wxXmlNode* node);
     bool ImportXML(wxRichTextBuffer* buffer, wxRichTextObject* obj, wxXmlNode* node);
     bool ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node);
     bool ImportProperties(wxRichTextObject* obj, wxXmlNode* node);

+    bool ImportProperties(wxRichTextProperties& properties, wxXmlNode* node);

 
     /// Import style parameters
     bool ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, bool isPara = false);
 
     /// Import style parameters
     bool ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, bool isPara = false);


@@ -76,7 +78,7 @@ public:
 
     /// Creates an object given an XML element name
     virtual wxRichTextObject* CreateObjectForXMLName(wxRichTextObject* parent, const wxString& name) const;
 
     /// Creates an object given an XML element name
     virtual wxRichTextObject* CreateObjectForXMLName(wxRichTextObject* parent, const wxString& name) const;

-    
+

     /// Can we save using this handler?
     virtual bool CanSave() const { return true; }
 
     /// Can we save using this handler?
     virtual bool CanSave() const { return true; }
 


@@ -96,6 +98,17 @@ public:
     wxString GetText(wxXmlNode *node, const wxString& param = wxEmptyString, bool translate = false);
     static wxXmlNode* FindNode(wxXmlNode* node, const wxString& name);
 
     wxString GetText(wxXmlNode *node, const wxString& param = wxEmptyString, bool translate = false);
     static wxXmlNode* FindNode(wxXmlNode* node, const wxString& name);
 

+    /**
+        Call with XML node name, C++ class name so that wxRTC can read in the node.
+        If you add a custom object, call this.
+    */
+    static void RegisterNodeName(const wxString& nodeName, const wxString& className) { sm_nodeNameToClassMap[nodeName] = className; }
+
+    /**
+        Cleans up the mapping between node name and C++ class.
+    */
+    static void ClearNodeToClassMap() { sm_nodeNameToClassMap.clear(); }
+

 protected:
 #if wxUSE_STREAMS
     virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
 protected:
 #if wxUSE_STREAMS
     virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);


@@ -107,6 +120,8 @@ protected:
     wxMBConv* m_convMem;
     wxMBConv* m_convFile;
 #endif
     wxMBConv* m_convMem;
     wxMBConv* m_convFile;
 #endif

+
+    static wxStringToStringHashMap sm_nodeNameToClassMap;

 };
 
 #endif
 };
 
 #endif