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

lists rendering fixes (second part of patch 911377)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-03-21 10:37:21 +00:00
parent d49520c318
commit 5b2b456fb1
10 changed files with 180 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/html/test/Makefile.in
View File

@@ -159,7 +159,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
data:
@mkdir -p .
@for f in f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm; do \
@for f in f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm; do \
if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f \) ; then \
cp -pRf $(srcdir)/$$f . ; \
fi; \

28
samples/html/test/listtest.htm Normal file
View File

@@ -0,0 +1,28 @@
<html>
<body>
<ul>
<li>This is line one, try to make page width very small</li>
<li>Same with line 2</li>
</ul>
------
<table>
<tr>
<td>
<ul><li>Simple list in a table. This table cell may wrap.</li></ul>
</td>
<td>
Second column, unimportant
</td>
<tr>
<tr>
<td nowrap>
<ul><li>List in a table, this cell should not wrap</li></ul>
</td>
<td>
Second column, unimportant
</td>
<tr>
</table>
</body>
</html>

2
samples/html/test/makefile.bcc
View File

@@ -179,7 +179,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\test_test.obj: .\test.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

2
samples/html/test/makefile.gcc
View File

@@ -176,7 +176,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
for %%f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
$(OBJS)\test_test.o: ./test.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<

2
samples/html/test/makefile.vc
View File

@@ -262,7 +262,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\test_test.obj: .\test.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

2
samples/html/test/makefile.wat
View File

@@ -216,7 +216,7 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res
data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<

3
samples/html/test/test.bkl
View File

@@ -17,7 +17,8 @@
<wx-data id="data">
<files>
f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp
tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm
tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm
regres.htm
</files>
</wx-data>

6
samples/html/test/test.htm
View File

@@ -7,9 +7,11 @@
<BODY TEXT="#000000" BGCOLOR="#B3B6E0" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
<font size=+2>
<b><a href="tables.htm">click here to go to tables test page!</a></b>
<b><a href="tables.htm">click here to go to tables test page</a></b>
<p>
<b><a href="imagemap.htm">click here to go to IMAGEMAPs test page!</a></b>
<b><a href="tables.htm">click here to go to lists test page</a></b>
<p>
<b><a href="imagemap.htm">click here to go to IMAGEMAPs test page</a></b>
<p>
<b><a href="8859_2.htm">i18n demo 1 (iso8859-2)</a></b>
<p>