added dummy <style> handler in order to hide CSS code

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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 6f12b3971e4b091694f63c4afb564bcab7cc89f5..1594e61f62d642e20a748c15cc078d0ed14602bc 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -696,6 +696,7 @@ m_dflist.cpp        HTML
 m_pre.cpp      HTML
 m_tables.cpp   HTML
 m_meta.cpp     HTML
+m_style.cpp    HTML
 htmprint.cpp   HTML
 
 arrimpl.cpp    WXH     Base

diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h
index 6fb8810fdb7026ff7e41e88048994fe581a31c67..38aca9f6726a3259be738eab59b19f1469fe55b6 100644 (file)
--- a/include/wx/html/forcelnk.h
+++ b/include/wx/html/forcelnk.h
@@ -67,7 +67,8 @@ See mod_*.cpp and htmlwin.cpp for example :-)
     FORCE_LINK(m_hline) \
     FORCE_LINK(m_links) \
     FORCE_LINK(m_tables) \
-    FORCE_LINK(m_meta)
+    FORCE_LINK(m_meta) \
+    FORCE_LINK(m_style)
 
 
 #endif // _WX_FORCELNK_H_

diff --git a/src/files.lst b/src/files.lst
index 81206f485a921f6b208beb9c884d59416a2a4228..07cbc08cbb1df3e1c71b5a0f7318a51cba74192d 100644 (file)
--- a/src/files.lst
+++ b/src/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
                common/init.cpp \

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 2b41fb20f950cb24aeea12769e24f3bf3b25d795..cfa226ecf38bafe271bef133ae84cbed833c8abe 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \
@@ -259,6 +259,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -957,6 +958,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index 2b41fb20f950cb24aeea12769e24f3bf3b25d795..cfa226ecf38bafe271bef133ae84cbed833c8abe 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \
@@ -259,6 +259,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -957,6 +958,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/html/m_style.cpp b/src/html/m_style.cpp
new file mode 100644 (file)
index 0000000..112bf3a
--- /dev/null
+++ b/src/html/m_style.cpp
@@ -0,0 +1,51 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        m_style.cpp
+// Purpose:     wxHtml module for parsing <style> tag
+// Author:      Vaclav Slavik
+// RCS-ID:      $Id$
+// Copyright:   (c) 2002 Vaclav Slavik
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "wx/wxprec.h"
+
+
+#include "wx/defs.h"
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifdef __BORDLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WXPRECOMP
+#endif
+
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"
+
+FORCE_LINK_ME(m_style)
+
+
+TAG_HANDLER_BEGIN(STYLE, "STYLE")
+
+    TAG_HANDLER_PROC(tag)
+    {
+        // VS: Ignore styles for now. We must have this handler present,
+        //     because CSS style text would be rendered verbatim otherwise
+        return TRUE;
+    }
+
+TAG_HANDLER_END(STYLE)
+
+
+TAGS_MODULE_BEGIN(StyleTag)
+
+    TAGS_MODULE_ADD(STYLE)
+
+TAGS_MODULE_END(StyleTag)
+
+#endif

diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index 013fb23c602f268f2e884524335c6789a6a358d9..f0dfa5f974debaa80188bb62ce1aac96aa7c88fb 100644 (file)
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -266,6 +266,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -925,6 +926,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/mac/files.lst b/src/mac/files.lst
index 013fb23c602f268f2e884524335c6789a6a358d9..f0dfa5f974debaa80188bb62ce1aac96aa7c88fb 100644 (file)
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -266,6 +266,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -925,6 +926,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index 2cbfc5ccdec3a91268f13dffaf2b146f05fd91f7..a8d07dfbcb3c9509278ce91b5b680d9856fde75f 100644 (file)
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MGL.T!
 ALL_SOURCES = \
                generic/accel.cpp \
@@ -221,6 +221,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -744,6 +745,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index faaf8da49317d9febe13470557e4e6475065fec4..72bbd65a8d84ae4cb8b98f6bd2a85ec7989acb85 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -295,6 +295,7 @@ HTMLOBJS = helpctrl.obj &
        m_list.obj &
        m_meta.obj &
        m_pre.obj &
+       m_style.obj &
        m_tables.obj &
        winpars.obj
 
@@ -1105,6 +1106,9 @@ m_meta.obj:     $(HTMLDIR)\m_meta.cpp
 m_pre.obj:     $(HTMLDIR)\m_pre.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+m_style.obj:     $(HTMLDIR)\m_style.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 m_tables.obj:     $(HTMLDIR)\m_tables.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/microwin/files.lst b/src/microwin/files.lst
index 245b5ae6991a946d0c1af17fb2a8eb6d0b1d6f75..27a88fcd7ad3d956c0f3304243a113983bb2106c 100644 (file)
--- a/src/microwin/files.lst
+++ b/src/microwin/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MICRO.T!
 ALL_SOURCES = \
                generic/accel.cpp \
@@ -221,6 +221,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -837,6 +838,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 557f518eb58f445dfaffb65605951790629e26ff..5a9a8a53dc4fadcd9cb4555d13cf339a0739ea49 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -250,6 +250,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -862,6 +863,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/msw/files.lst b/src/msw/files.lst
index aa2350a7949a01c17ef83f1e77868bf73085146e..faef438aad279093b5f035281246b4cfcb98f856 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -277,6 +277,7 @@ ALL_SOURCES = \
                html/m_list.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
+               html/m_style.cpp \
                html/m_tables.cpp \
                html/winpars.cpp
 
@@ -987,6 +988,7 @@ HTMLOBJS = \
                m_list.o \
                m_meta.o \
                m_pre.o \
+               m_style.o \
                m_tables.o \
                winpars.o
 

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index c9782246d7a3b03d2b94560cebc1be606afa46cd..a3641957b0e78ba623a8eed8e02ec920e66ba6fe 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -364,6 +364,7 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\m_list.obj \
                $(MSWDIR)\m_meta.obj \
                $(MSWDIR)\m_pre.obj \
+               $(MSWDIR)\m_style.obj \
                $(MSWDIR)\m_tables.obj \
                $(MSWDIR)\winpars.obj
 
@@ -988,6 +989,8 @@ $(MSWDIR)\m_meta.obj: $(HTMLDIR)\m_meta.$(SRCSUFF)
 
 $(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
 
+$(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF)
+
 $(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
 
 $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 854fc94dc932bd4166fd193b0d884b634f725cae..68c6f80aaab3b0b57241eec6ac4aec560a1d556a 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 1fccb63959cf6cf578509342cad63e022fee8c5a..64ed05ba9af59567400be94260860e25778ad476 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index e2995a956af4cf9a24dcd9aaea4c1421b411aa45..e6af5575b5dff09654f8b37f74d4d3d240fc69ca 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -244,6 +244,7 @@ HTMLOBJS = \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
                $(HTMLDIR)/m_meta.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
+               $(HTMLDIR)/m_style.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/winpars.$(OBJSUFF)
 

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index b2bb58e10a39efe3c660c365638a628dc4ca388a..701eb62db95ffd423a24607b5d1e0dc7cb842593 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 202f56f704c164039d75f7a1ceb2113bdc525c0e..f577adba32c3ff0c392f9ebe1713072f4ee7eab0 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -384,6 +384,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
                $(HTMLDIR)\$D\m_list.obj \
                $(HTMLDIR)\$D\m_meta.obj \
                $(HTMLDIR)\$D\m_pre.obj \
+               $(HTMLDIR)\$D\m_style.obj \
                $(HTMLDIR)\$D\m_tables.obj \
                $(HTMLDIR)\$D\winpars.obj
 

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 6602183484184bc3eb440cc4a71ed40552175bc5..0da349c5935e68f6421035307a89d5b83b2c82d1 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -349,6 +349,7 @@ HTMLOBJS = helpctrl.obj &
        m_list.obj &
        m_meta.obj &
        m_pre.obj &
+       m_style.obj &
        m_tables.obj &
        winpars.obj
 
@@ -1258,6 +1259,9 @@ m_meta.obj:     $(HTMLDIR)\m_meta.cpp
 m_pre.obj:     $(HTMLDIR)\m_pre.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+m_style.obj:     $(HTMLDIR)\m_style.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 m_tables.obj:     $(HTMLDIR)\m_tables.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/univ/files.lst b/src/univ/files.lst
index 4f63abc71d505e22ded71035a4d167f8864c6c2f..8fee0df985a84fc0fcdc3e93afd3ea0837346c18 100644 (file)
--- a/src/univ/files.lst
+++ b/src/univ/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
 UNIVOBJS = \
                bmpbuttn.o \

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 30c570ff73212ebb438834fab2c89bd7a037a916..ffd95f067095a09eef57eb498c56479429460fa4 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -838,6 +838,10 @@ SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\m_style.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index c7afd9b58739ad3f6332e4f238717449e549bb73..cbd48d27ad22477fe74dfa12f082b88870533618 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -951,6 +951,10 @@ SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\m_style.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File