make it possible to build in ANSI build on Windows again

[wxWidgets.git] / include / wx / html / htmltag.h

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 7c86431ef731a4bac35795dc3af17680e1f25ff7..d429d74f704b32337837a0b18099be4ce809be50 100644 (file)
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef _WX_HTMLTAG_H_
 #define _WX_HTMLTAG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "htmltag.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_HTML
@@ -22,8 +17,8 @@
 #include "wx/object.h"
 #include "wx/arrstr.h"
 
-class WXDLLIMPEXP_CORE wxColour;
-class WXDLLIMPEXP_HTML wxHtmlEntitiesParser;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser;
 
 //-----------------------------------------------------------------------------
 // wxHtmlTagsCache
@@ -44,7 +39,7 @@ private:
 public:
     wxHtmlTagsCache() : wxObject() {m_CacheSize = 0; m_Cache = NULL;}
     wxHtmlTagsCache(const wxString& source);
-    ~wxHtmlTagsCache() {free(m_Cache);}
+    virtual ~wxHtmlTagsCache() {free(m_Cache);}
 
     // Finds parameters for tag starting at at and fills the variables
     void QueryTag(int at, int* end1, int* end2);
@@ -73,7 +68,7 @@ protected:
               wxHtmlEntitiesParser *entParser);
     friend class wxHtmlParser;
 public:
-    ~wxHtmlTag();
+    virtual ~wxHtmlTag();
 
     wxHtmlTag *GetParent() const {return m_Parent;}
     wxHtmlTag *GetFirstSibling() const;
@@ -110,17 +105,12 @@ public:
     // (like sscanf() does)
     // NOTE: unlike scanf family, this function only accepts
     //       *one* parameter !
-    int ScanParam(const wxString& par, const wxChar *format, void *param) const;
+    int ScanParam(const wxString& par, const char *format, void *param) const;
+    int ScanParam(const wxString& par, const wchar_t *format, void *param) const;
 
     // Returns string containing all params.
     wxString GetAllParams() const;
 
-#if WXWIN_COMPATIBILITY_2_2
-    // return true if this is ending tag (</something>) or false
-    // if it isn't (<something>)
-    wxDEPRECATED( bool IsEnding() const );
-#endif
-
     // return true if this there is matching ending tag
     inline bool HasEnding() const {return m_End1 >= 0;}