removed/replaced include 'wx/wx.h'

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

include/wx/html/htmltag.h

@@ -16,8 +16,12 @@
 #endif
 
 #include "wx/defs.h"
+
 #if wxUSE_HTML
 
+#include "wx/object.h"
+
+class WXDLLEXPORT wxColour;
 class WXDLLEXPORT wxHtmlEntitiesParser;
 
 //-----------------------------------------------------------------------------
@@ -60,7 +64,7 @@ public:
     // constructs wxHtmlTag object based on HTML tag.
     // The tag begins (with '<' character) at position pos in source
     // end_pos is position where parsing ends (usually end of document)
-    wxHtmlTag(const wxString& source, int pos, int end_pos, 
+    wxHtmlTag(const wxString& source, int pos, int end_pos,
               wxHtmlTagsCache *cache,
               wxHtmlEntitiesParser *entParser = NULL);
 
@@ -79,7 +83,7 @@ public:
     //                           (or ("WhaT.jpg") if with_commas == TRUE)
     wxString GetParam(const wxString& par, bool with_commas = FALSE) const;
 
-    // Convenience functions:    
+    // Convenience functions:
     bool GetParamAsColour(const wxString& par, wxColour *clr) const;
     bool GetParamAsInt(const wxString& par, int *clr) const;
 

include/wx/html/m_templ.h

@@ -23,30 +23,11 @@ I STRONGLY recommend reading and understanding these macros!!
 #define _WX_M_TEMPL_H_
 
 #include "wx/defs.h"
+
 #if wxUSE_HTML
 
-
-#ifdef __GNUG__
-#pragma interface "m_templ.h"
-#pragma implementation
-#endif
-
-#include <wx/wxprec.h>
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
-
-
-
-
 #include "wx/html/winpars.h"
 
-
 #define TAG_HANDLER_BEGIN(name,tags)                                      \
     class HTML_Handler_##name : public wxHtmlWinTagHandler                \
     {                                                                     \