Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fl_Help_View didn't support HTML comments.

Browse Source 
Fl_Help_View didn't add the cellpadding when doing colspan's...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2588 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2002-08-15 19:38:53 +00:00
parent 6c3f9a03d1
commit f9a0613202
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -2,6 +2,9 @@ CHANGES IN FLTK 1.1.0
- Fl_Text_Display::buffer() now calls resize() to show - Fl_Text_Display::buffer() now calls resize() to show
the buffer. the buffer.
- Fl_Help_View didn't support HTML comments.
- Fl_Help_View didn't include the extra cellpadding when
handling colspan attributes in cells.
CHANGES IN FLTK 1.1.0rc6 CHANGES IN FLTK 1.1.0rc6
src/Fl_Help_View.cxx
+32 -4
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Help_View.cxx,v 1.1.2.38 2002/08/09 01:09:49 easysw Exp $" // "$Id: Fl_Help_View.cxx,v 1.1.2.39 2002/08/15 19:38:53 easysw Exp $"
// //
// Fl_Help_View widget routines. // Fl_Help_View widget routines.
// //
@@ -459,6 +459,20 @@ Fl_Help_View::draw()
if (*ptr == '<') if (*ptr == '<')
{ {
ptr ++; ptr ++;
if (strncmp(ptr, "!--", 3) == 0)
{
// Comment...
ptr += 3;
if ((ptr = strstr(ptr, "-->")) != NULL)
{
ptr += 3;
continue;
}
else
break;
}
while (*ptr && *ptr != '>' && !isspace(*ptr)) while (*ptr && *ptr != '>' && !isspace(*ptr))
if (s < (buf + sizeof(buf) - 1)) if (s < (buf + sizeof(buf) - 1))
*s++ = *ptr++; *s++ = *ptr++;
@@ -930,6 +944,20 @@ Fl_Help_View::format()
{ {
start = ptr; start = ptr;
ptr ++; ptr ++;
if (strncmp(ptr, "!--", 3) == 0)
{
// Comment...
ptr += 3;
if ((ptr = strstr(ptr, "-->")) != NULL)
{
ptr += 3;
continue;
}
else
break;
}
while (*ptr && *ptr != '>' && !isspace(*ptr)) while (*ptr && *ptr != '>' && !isspace(*ptr))
if (s < (buf + sizeof(buf) - 1)) if (s < (buf + sizeof(buf) - 1))
*s++ = *ptr++; *s++ = *ptr++;
@@ -1244,8 +1272,8 @@ Fl_Help_View::format()
else else
colspan = 1; colspan = 1;
for (i = 0, ww = 0; i < colspan; i ++) for (i = 0, ww = -6; i < colspan; i ++)
ww += columns[column + i]; ww += columns[column + i] + 6;
if (block->end == block->start && nblocks_ > 1) if (block->end == block->start && nblocks_ > 1)
{ {
@@ -2648,5 +2676,5 @@ hscrollbar_callback(Fl_Widget *s, void *)
// //
// End of "$Id: Fl_Help_View.cxx,v 1.1.2.38 2002/08/09 01:09:49 easysw Exp $". // End of "$Id: Fl_Help_View.cxx,v 1.1.2.39 2002/08/15 19:38:53 easysw Exp $".
// //