reverted the hack for accepting broken HHC files (new wxHF_xxxx flags provide same...

[wxWidgets.git] / contrib / include / wx / xml / xmlio.h

diff --git a/contrib/include/wx/xml/xmlio.h b/contrib/include/wx/xml/xmlio.h
index 788f1f802312101d8b382afe4885e7dfc0d641c7..81bb5430478bfa7ee266412bd49576cecaeedd7d 100644 (file)
--- a/contrib/include/wx/xml/xmlio.h
+++ b/contrib/include/wx/xml/xmlio.h
@@ -20,53 +20,64 @@
 #include "wx/xml/xml.h"
 
 
 #include "wx/xml/xml.h"
 
 

-class wxXmlIOHandlerBin : public wxXmlIOHandler
+class WXDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler

 {
 {

-    public:
-        wxXmlIOHandlerBin() {}
-
-        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);
+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);
+};

 
 

-#if wxUSE_ZLIB

 
 

-class wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
+class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler

 {
 {

-    public:
-        wxXmlIOHandlerBinZ() {}
+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_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);
+protected: 
+    wxString ReadHeader(wxInputStream& stream);
+    void WriteHeader(wxOutputStream& stream, const wxString& header);

 };
 
 };
 

-#endif

 
 
 
 

+#if wxUSE_ZLIB

 
 

-class wxXmlIOHandlerLibxml : public wxXmlIOHandler
+class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin

 {
 {

-    public:
-        virtual wxXmlIOType GetType() { return wxXML_IO_LIBXML; }
-        virtual bool CanLoad(wxInputStream& stream);
-        virtual bool CanSave();
+public:
+    wxXmlIOHandlerBinZ() {}
+
+    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
+

 
 #endif // _WX_XMLIO_H_
 
 #endif // _WX_XMLIO_H_