switched wxXML to expat parser; some formatting mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/include/wx/xml/xh_bmp.h

@@ -20,18 +20,18 @@
 
 class WXDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxBitmapXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxBitmapXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 class WXDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxIconXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxIconXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_bmpbt.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxBitmapButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxBitmapButtonXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_bttn.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxButtonXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_cald.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxCalendarCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxCalendarCtrlXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_chckb.h

@@ -22,10 +22,10 @@
 
 class WXDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxCheckBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxCheckBoxXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_chckl.h

@@ -19,13 +19,13 @@
 
 class WXDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxCheckListXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
+public:
+    wxCheckListXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+private:
+    bool m_insideBox;
+    wxArrayString strList;
 };
 
 

contrib/include/wx/xml/xh_choic.h

@@ -19,13 +19,13 @@
 
 class WXDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxChoiceXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
+public:
+    wxChoiceXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+private:
+    bool m_insideBox;
+    wxArrayString strList;
 };
 
 

contrib/include/wx/xml/xh_combo.h

@@ -21,13 +21,13 @@
 
 class WXDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxComboBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
+public:
+    wxComboBoxXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+private:
+    bool m_insideBox;
+    wxArrayString strList;
 };
 
 #endif

contrib/include/wx/xml/xh_dlg.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxDialogXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxDialogXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_frame.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxFrameXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxFrameXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_gauge.h

@@ -29,10 +29,10 @@ class WXDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
         wxGAUGE_DEFAULT_RANGE = 100
     };
 
-    public:
-        wxGaugeXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxGaugeXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_html.h

@@ -23,10 +23,10 @@
 
 class WXDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxHtmlWindowXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxHtmlWindowXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_listb.h

@@ -21,13 +21,13 @@
 
 class WXDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxListBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
+public:
+    wxListBoxXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+private:
+    bool m_insideBox;
+    wxArrayString strList;
 };
 
 #endif

contrib/include/wx/xml/xh_listc.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxListCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxListCtrlXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_menu.h

@@ -19,13 +19,13 @@
 
 class WXDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxMenuXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-        
-    private:
-        bool m_InsideMenu;
+public:
+    wxMenuXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+
+private:
+    bool m_insideMenu;
 };
 
 class WXDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler

contrib/include/wx/xml/xh_notbk.h

@@ -22,14 +22,14 @@ class WXDLLEXPORT wxNotebook;
 
 class WXDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxNotebookXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-        
-    private:
-        bool m_IsInside;
-        wxNotebook *m_Notebook;
+public:
+    wxNotebookXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+
+private:
+    bool m_isInside;
+    wxNotebook *m_notebook;
 };
 
 #endif

contrib/include/wx/xml/xh_panel.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxPanelXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxPanelXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_radbt.h

@@ -22,10 +22,10 @@
 
 class WXDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxRadioButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxRadioButtonXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_radbx.h

@@ -21,13 +21,13 @@
 
 class WXDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxRadioBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
+public:
+    wxRadioBoxXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+private:
+    bool m_insideBox;
+    wxArrayString strList;
 };
 
 #endif

contrib/include/wx/xml/xh_scrol.h

@@ -29,10 +29,10 @@ class WXDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
         wxSL_DEFAULT_MAX = 100
     };
 
-    public:
-        wxScrollBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxScrollBarXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_sizer.h

@@ -22,16 +22,16 @@ class WXDLLEXPORT wxSizer;
 
 class WXDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxSizerXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxSizerXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+
+private:
+    bool m_isInside;
+    wxSizer *m_parentSizer;
         
-    private:
-        bool m_IsInside;
-        wxSizer *m_ParentSizer;
-        
-        bool IsSizerNode(wxXmlNode *node);
+    bool IsSizerNode(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_slidr.h

@@ -29,10 +29,10 @@ class WXDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
         wxSL_DEFAULT_MAX = 100
     };
 
-    public:
-        wxSliderXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxSliderXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_spin.h

@@ -28,10 +28,10 @@ class WXDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
         wxSP_DEFAULT_MAX = 100
     };
 
-    public:
-        wxSpinButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxSpinButtonXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 #endif
 
@@ -45,10 +45,10 @@ class WXDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
         wxSP_DEFAULT_MAX = 100
     };
 
-    public:
-        wxSpinCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxSpinCtrlXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 #endif
 

contrib/include/wx/xml/xh_stbmp.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxStaticBitmapXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxStaticBitmapXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_stbox.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxStaticBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxStaticBoxXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_stlin.h

@@ -21,10 +21,10 @@
 
 class WXDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxStaticLineXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxStaticLineXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_sttxt.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxStaticTextXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxStaticTextXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_text.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxTextCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxTextCtrlXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_toolb.h

@@ -23,14 +23,14 @@ class WXDLLEXPORT wxToolBar;
 
 class WXDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxToolBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxToolBarXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
         
-    private:
-        bool m_IsInside;
-        wxToolBar *m_Toolbar;
+private:
+    bool m_isInside;
+    wxToolBar *m_toolbar;
 };
 
 #endif

contrib/include/wx/xml/xh_tree.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxTreeCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxTreeCtrlXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_unkwn.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxUnknownWidgetXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+public:
+    wxUnknownWidgetXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xmlio.h

@@ -20,21 +20,45 @@
 #include "wx/xml/xml.h"
 
 
+class WXDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
+{
+public:
+    virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; }
+    virtual bool CanLoad(wxInputStream& stream);
+    virtual bool CanSave() { return FALSE; }
+
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc) { return FALSE; }
+};
+
+
+class WXDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
+{
+public:
+    virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; }
+    virtual bool CanLoad(wxInputStream& stream) { return FALSE; }
+    virtual bool CanSave() { return TRUE; }
+
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc) { return FALSE; }
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
+};
+
+
 class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
 {
-    public:
-        wxXmlIOHandlerBin() {}
+public:
+    wxXmlIOHandlerBin() {}
 
-        virtual wxXmlIOType GetType() { return wxXML_IO_BIN; }
-        virtual bool CanLoad(wxInputStream& stream);
-        virtual bool CanSave() { return TRUE; }
+    virtual wxXmlIOType GetType() { return wxXML_IO_BIN; }
+    virtual bool CanLoad(wxInputStream& stream);
+    virtual bool CanSave() { return TRUE; }
 
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-        
-    protected: 
-        wxString ReadHeader(wxInputStream& stream);
-        void WriteHeader(wxOutputStream& stream, const wxString& header);
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
+
+protected: 
+    wxString ReadHeader(wxInputStream& stream);
+    void WriteHeader(wxOutputStream& stream, const wxString& header);
 };
 
 
@@ -43,30 +67,17 @@ class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
 
 class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
 {
-    public:
-        wxXmlIOHandlerBinZ() {}
+public:
+    wxXmlIOHandlerBinZ() {}
 
-        virtual wxXmlIOType GetType() { return wxXML_IO_BINZ; }
-        virtual bool CanLoad(wxInputStream& stream);
+    virtual wxXmlIOType GetType() { return wxXML_IO_BINZ; }
+    virtual bool CanLoad(wxInputStream& stream);
 
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
 };
 
 #endif
 
 
-
-class WXDLLEXPORT wxXmlIOHandlerLibxml : public wxXmlIOHandler
-{
-    public:
-        virtual wxXmlIOType GetType() { return wxXML_IO_LIBXML; }
-        virtual bool CanLoad(wxInputStream& stream);
-        virtual bool CanSave();
-
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-};
-
-
 #endif // _WX_XMLIO_H_