summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--src/Fl_Help_View.cxx18
2 files changed, 14 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES
index 1fde5be65..2e8bda1b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
CHANGES IN FLTK 1.1.0b12
- - Drag'n'drop support for MacOS
- - Updated Mac OSIssues documentation
+ - Fl_Help_View didn't preserve target names (e.g.
+ "filename.html#target") when following links.
+ - Drag-and-drop support for MacOS.
+ - Updated MacOS issues documentation.
CHANGES IN FLTK 1.1.0b11
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 5cb3ed37c..bd2ca5b1f 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.27 2002/02/20 19:29:57 easysw Exp $"
+// "$Id: Fl_Help_View.cxx,v 1.1.2.28 2002/03/04 21:48:50 easysw Exp $"
//
// Fl_Help_View widget routines.
//
@@ -2153,7 +2153,8 @@ Fl_Help_View::handle(int event) // I - Event to handle
*tempptr; // Pointer into temporary filename
- if (strchr(directory_, ':') != NULL && strchr(link->filename, ':') == NULL)
+ if (strchr(directory_, ':') != NULL &&
+ strchr(link->filename, ':') == NULL)
{
if (link->filename[0] == '/')
{
@@ -2165,8 +2166,6 @@ Fl_Help_View::handle(int event) // I - Event to handle
}
else
sprintf(temp, "%s/%s", directory_, link->filename);
-
- load(temp);
}
else if (link->filename[0] != '/' && strchr(link->filename, ':') == NULL)
{
@@ -2177,11 +2176,14 @@ Fl_Help_View::handle(int event) // I - Event to handle
getcwd(dir, sizeof(dir));
sprintf(temp, "file:%s/%s", dir, link->filename);
}
-
- load(temp);
}
else
- load(link->filename);
+ strcpy(temp, link->filename);
+
+ if (link->name[0])
+ sprintf(temp + strlen(temp), "#%s", link->name);
+
+ load(temp);
}
else if (target[0])
topline(target);
@@ -2627,5 +2629,5 @@ hscrollbar_callback(Fl_Widget *s, void *)
//
-// End of "$Id: Fl_Help_View.cxx,v 1.1.2.27 2002/02/20 19:29:57 easysw Exp $".
+// End of "$Id: Fl_Help_View.cxx,v 1.1.2.28 2002/03/04 21:48:50 easysw Exp $".
//