diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 2f6a443e58..750a2e8477 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -97,10 +97,12 @@ class WXDLLEXPORT wxHtmlTag : public wxObject //
GetParam("SRC") returns (WhaT.jpg)
// (or ("WhaT.jpg") if with_commas == TRUE)
- void ScanParam(const wxString& par, char *format, ...) const;
+ int ScanParam(const wxString& par, char *format, ...) const;
// Scans param like scanf() functions family do.
// Example : ScanParam("COLOR", "\"#%X\"", &clr);
// This is always with with_commas=FALSE
+ // Returns number of scanned values
+ // (like sscanf() does)
inline const wxString& GetAllParams() const {return m_Params;};
// Returns string containing all params.
diff --git a/include/wx/html/version.h b/include/wx/html/version.h
deleted file mode 100644
index 49ff8aeae8..0000000000
--- a/include/wx/html/version.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#define wxHTML_VERSION_MAJOR 0
-#define wxHTML_VERSION_MINOR 2
-#define wxHTML_VERSION_REL 3
-
-#define wxHTML_VERSION (wxHTML_VERSION_MAJOR * 1000 + wxHTML_VERSION_MINOR * 100 + wxHTML_VERSION_REL)
-
diff --git a/include/wx/wxhtml.h b/include/wx/wxhtml.h
index f8082a7aaa..718eb1f169 100644
--- a/include/wx/wxhtml.h
+++ b/include/wx/wxhtml.h
@@ -14,7 +14,6 @@
#endif
-#include