From 3c6019c1793290b4a54c9a048f45cc396fcceb36 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 2 Oct 2001 16:54:45 +0000 Subject: Support for NAME and HREF for A at the same time. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1632 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 3 +++ src/Fl_Help_View.cxx | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index de1f41b55..42a3d7eb6 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,9 @@ CHANGES IN FLTK 1.1.0b4 - Fl_Help_View::add_image() did not initialize the image member of the base (unscaled) image. + - Fl_Help_View didn't support A elements with both a + NAME and HREF attribute - the HREF was ignored. + CHANGES IN FLTK 1.1.0b3 diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 4cc2180d2..748e7f213 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.3 2001/10/01 19:38:28 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.4 2001/10/02 16:54:45 easysw Exp $" // // Fl_Help_View widget routines. // @@ -1565,7 +1565,8 @@ Fl_Help_View::format() { if (get_attr(attrs, "NAME", attr, sizeof(attr)) != NULL) add_target(attr, yy - size - 2); - else if (get_attr(attrs, "HREF", attr, sizeof(attr)) != NULL) + + if (get_attr(attrs, "HREF", attr, sizeof(attr)) != NULL) { strncpy(link, attr, sizeof(link) - 1); link[sizeof(link) - 1] = '\0'; @@ -3578,5 +3579,5 @@ scrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.3 2001/10/01 19:38:28 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.4 2001/10/02 16:54:45 easysw Exp $". // -- cgit v1.2.3