diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 16 | ||||
| -rw-r--r-- | src/Fl_PNM_Image.cxx | 6 |
3 files changed, 16 insertions, 7 deletions
@@ -1,6 +1,7 @@ CHANGES IN FLTK 1.1.0rc3 - Documentation updates. + - Fl_Help_View didn't support the TT markup. - Fl_Shared_Image used a double-pointer to the image handler functions, which was unnecessary and unintuitive. diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index b6d3834b7..12113b2b4 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.cxx,v 1.1.2.33 2002/05/24 14:19:19 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.34 2002/05/27 21:16:47 easysw Exp $" // // Fl_Help_View widget routines. // @@ -587,7 +587,8 @@ Fl_Help_View::draw() else if (strcasecmp(buf, "I") == 0 || strcasecmp(buf, "EM") == 0) pushfont(font |= FL_ITALIC, size); - else if (strcasecmp(buf, "CODE") == 0) + else if (strcasecmp(buf, "CODE") == 0 || + strcasecmp(buf, "TT") == 0) pushfont(font = FL_COURIER, size); else if (strcasecmp(buf, "KBD") == 0) pushfont(font = FL_COURIER_BOLD, size); @@ -606,6 +607,7 @@ Fl_Help_View::draw() strcasecmp(buf, "/I") == 0 || strcasecmp(buf, "/EM") == 0 || strcasecmp(buf, "/CODE") == 0 || + strcasecmp(buf, "/TT") == 0 || strcasecmp(buf, "/KBD") == 0 || strcasecmp(buf, "/VAR") == 0) popfont(font, size); @@ -1277,7 +1279,8 @@ Fl_Help_View::format() else if (strcasecmp(buf, "I") == 0 || strcasecmp(buf, "EM") == 0) pushfont(font |= FL_ITALIC, size); - else if (strcasecmp(buf, "CODE") == 0) + else if (strcasecmp(buf, "CODE") == 0 || + strcasecmp(buf, "TT") == 0) pushfont(font = FL_COURIER, size); else if (strcasecmp(buf, "KBD") == 0) pushfont(font = FL_COURIER_BOLD, size); @@ -1288,6 +1291,7 @@ Fl_Help_View::format() strcasecmp(buf, "/I") == 0 || strcasecmp(buf, "/EM") == 0 || strcasecmp(buf, "/CODE") == 0 || + strcasecmp(buf, "/TT") == 0 || strcasecmp(buf, "/KBD") == 0 || strcasecmp(buf, "/VAR") == 0) popfont(font, size); @@ -1721,7 +1725,8 @@ Fl_Help_View::format_table(int *table_width, // O - Total table width else if (strcasecmp(buf, "I") == 0 || strcasecmp(buf, "EM") == 0) pushfont(font |= FL_ITALIC, size); - else if (strcasecmp(buf, "CODE") == 0) + else if (strcasecmp(buf, "CODE") == 0 || + strcasecmp(buf, "TT") == 0) pushfont(font = FL_COURIER, size); else if (strcasecmp(buf, "KBD") == 0) pushfont(font = FL_COURIER_BOLD, size); @@ -1732,6 +1737,7 @@ Fl_Help_View::format_table(int *table_width, // O - Total table width strcasecmp(buf, "/I") == 0 || strcasecmp(buf, "/EM") == 0 || strcasecmp(buf, "/CODE") == 0 || + strcasecmp(buf, "/TT") == 0 || strcasecmp(buf, "/KBD") == 0 || strcasecmp(buf, "/VAR") == 0) popfont(font, size); @@ -2625,5 +2631,5 @@ hscrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.33 2002/05/24 14:19:19 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.34 2002/05/27 21:16:47 easysw Exp $". // diff --git a/src/Fl_PNM_Image.cxx b/src/Fl_PNM_Image.cxx index d3dc8b59b..c6de8ba15 100644 --- a/src/Fl_PNM_Image.cxx +++ b/src/Fl_PNM_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_PNM_Image.cxx,v 1.1.2.7 2002/05/25 13:38:24 easysw Exp $" +// "$Id: Fl_PNM_Image.cxx,v 1.1.2.8 2002/05/27 21:16:47 easysw Exp $" // // Fl_PNM_Image routines. // @@ -115,6 +115,8 @@ Fl_PNM_Image::Fl_PNM_Image(const char *name) // I - File to read if (format == 1 || format == 2 || format == 4 || format == 5) d(1); else d(3); +// printf("%s = %dx%dx%d\n", name, w(), h(), d()); + array = new uchar[w() * h() * d()]; // Read the image file... @@ -161,5 +163,5 @@ Fl_PNM_Image::Fl_PNM_Image(const char *name) // I - File to read // -// End of "$Id: Fl_PNM_Image.cxx,v 1.1.2.7 2002/05/25 13:38:24 easysw Exp $". +// End of "$Id: Fl_PNM_Image.cxx,v 1.1.2.8 2002/05/27 21:16:47 easysw Exp $". // |