Prevent seg fault for older GTK+

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

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 75f71ec6ee0f4d421ef883952081e6692c9475ce..92a93438a33a55f4f0b2f7bce3307b2979e8d19f 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
@@ -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;
@@ -87,17 +82,17 @@ public:
     // Returns tag's name in uppercase.
     inline wxString GetName() const {return m_Name;}
 
-    // Returns TRUE if the tag has given parameter. Parameter
+    // Returns true if the tag has given parameter. Parameter
     // should always be in uppercase.
-    // Example : <IMG SRC="test.jpg"> HasParam("SRC") returns TRUE
+    // Example : <IMG SRC="test.jpg"> HasParam("SRC") returns true
     bool HasParam(const wxString& par) const;
 
     // Returns value of the param. Value is in uppercase unless it is
     // enclosed with "
     // Example : <P align=right> GetParam("ALIGN") returns (RIGHT)
     //           <P IMG SRC="WhaT.jpg"> GetParam("SRC") returns (WhaT.jpg)
-    //                           (or ("WhaT.jpg") if with_commas == TRUE)
-    wxString GetParam(const wxString& par, bool with_commas = FALSE) const;
+    //                           (or ("WhaT.jpg") if with_commas == true)
+    wxString GetParam(const wxString& par, bool with_commas = false) const;
 
     // Convenience functions:
     bool GetParamAsColour(const wxString& par, wxColour *clr) const;
@@ -105,23 +100,18 @@ public:
 
     // Scans param like scanf() functions family does.
     // Example : ScanParam("COLOR", "\"#%X\"", &clr);
-    // This is always with with_commas=FALSE
+    // This is always with with_commas=false
     // Returns number of scanned values
     // (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>)
-    inline bool IsEnding() const {return FALSE;}
-#endif
-
-    // return TRUE if this there is matching ending tag
+    // return true if this there is matching ending tag
     inline bool HasEnding() const {return m_End1 >= 0;}
 
     // returns beginning position of _internal_ block of text