From ddffcdf3284da1b67db12ef9af1a3da1d397ddc5 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 4 Mar 2002 21:48:50 +0000 Subject: Fix from Greg - Fl_Help_View didn't preserve the target in a link when following it. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1980 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Help_View.cxx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/Fl_Help_View.cxx') 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 $". // -- cgit v1.2.3