Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add <span> tag and limited support for CSS styles to wxHTML.

Browse Source 
Parse "style" attributes of the HTML tags and honour those of them that can be
mapped to the HTML 3 attributes.

Also add a handler for <span> tag.

Closes #10631.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-05-30 23:12:25 +00:00
parent c9554803fa
commit f68e16c5fc
26 changed files with 590 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
build/msw/makefile.gcc
View File

@@ -1023,8 +1023,10 @@ HTMLDLL_OBJECTS = \
$(OBJS)\htmldll_m_links.o \
$(OBJS)\htmldll_m_list.o \
$(OBJS)\htmldll_m_pre.o \
$(OBJS)\htmldll_m_span.o \
$(OBJS)\htmldll_m_style.o \
$(OBJS)\htmldll_m_tables.o \
$(OBJS)\htmldll_styleparams.o \
$(OBJS)\htmldll_winpars.o \
$(OBJS)\htmldll_htmllbox.o
HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
@@ -1058,8 +1060,10 @@ HTMLLIB_OBJECTS = \
$(OBJS)\htmllib_m_links.o \
$(OBJS)\htmllib_m_list.o \
$(OBJS)\htmllib_m_pre.o \
$(OBJS)\htmllib_m_span.o \
$(OBJS)\htmllib_m_style.o \
$(OBJS)\htmllib_m_tables.o \
$(OBJS)\htmllib_styleparams.o \
$(OBJS)\htmllib_winpars.o \
$(OBJS)\htmllib_htmllbox.o
QADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
@@ -1562,8 +1566,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_m_links.o \
$(OBJS)\monodll_m_list.o \
$(OBJS)\monodll_m_pre.o \
$(OBJS)\monodll_m_span.o \
$(OBJS)\monodll_m_style.o \
$(OBJS)\monodll_m_tables.o \
$(OBJS)\monodll_styleparams.o \
$(OBJS)\monodll_winpars.o \
$(OBJS)\monodll_htmllbox.o \
$(OBJS)\monodll_debugrpt.o \
@@ -2275,8 +2281,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_m_links.o \
$(OBJS)\monolib_m_list.o \
$(OBJS)\monolib_m_pre.o \
$(OBJS)\monolib_m_span.o \
$(OBJS)\monolib_m_style.o \
$(OBJS)\monolib_m_tables.o \
$(OBJS)\monolib_styleparams.o \
$(OBJS)\monolib_winpars.o \
$(OBJS)\monolib_htmllbox.o \
$(OBJS)\monolib_debugrpt.o \
@@ -6577,12 +6585,18 @@ $(OBJS)\monodll_m_list.o: ../../src/html/m_list.cpp
$(OBJS)\monodll_m_pre.o: ../../src/html/m_pre.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_m_span.o: ../../src/html/m_span.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_m_style.o: ../../src/html/m_style.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_m_tables.o: ../../src/html/m_tables.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_styleparams.o: ../../src/html/styleparams.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_winpars.o: ../../src/html/winpars.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8778,12 +8792,18 @@ $(OBJS)\monolib_m_list.o: ../../src/html/m_list.cpp
$(OBJS)\monolib_m_pre.o: ../../src/html/m_pre.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_m_span.o: ../../src/html/m_span.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_m_style.o: ../../src/html/m_style.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_m_tables.o: ../../src/html/m_tables.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_styleparams.o: ../../src/html/styleparams.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_winpars.o: ../../src/html/winpars.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13894,12 +13914,18 @@ $(OBJS)\htmldll_m_list.o: ../../src/html/m_list.cpp
$(OBJS)\htmldll_m_pre.o: ../../src/html/m_pre.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_m_span.o: ../../src/html/m_span.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_m_style.o: ../../src/html/m_style.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_m_tables.o: ../../src/html/m_tables.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_styleparams.o: ../../src/html/styleparams.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_winpars.o: ../../src/html/winpars.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13969,12 +13995,18 @@ $(OBJS)\htmllib_m_list.o: ../../src/html/m_list.cpp
$(OBJS)\htmllib_m_pre.o: ../../src/html/m_pre.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_m_span.o: ../../src/html/m_span.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_m_style.o: ../../src/html/m_style.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_m_tables.o: ../../src/html/m_tables.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_styleparams.o: ../../src/html/styleparams.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_winpars.o: ../../src/html/winpars.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<