removed html/version.h

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

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 2f6a443e580486f772cede52ddb6b97942880765..750a2e84771f405d7f13ee4647d543242b5e6546 100644 (file)
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -97,10 +97,12 @@ class WXDLLEXPORT wxHtmlTag : public wxObject
                 //           <P IMG SRC="WhaT.jpg"> 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 (file)
index 49ff8ae..0000000
--- 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 f8082a7aaa83f2b54566b7f6e241e545d0761f14..718eb1f169c96448d1dfea8a343678634158e58b 100644 (file)
--- a/include/wx/wxhtml.h
+++ b/include/wx/wxhtml.h
@@ -14,7 +14,6 @@
 #endif
 
 
-#include <wx/html/version.h>
 #include <wx/html/htmldefs.h>
 #include <wx/html/htmltag.h>
 #include <wx/html/htmlcell.h>