gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix from Greg - Fl_Help_View didn't preserve the target in a link when

Browse Source 
following it.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1980 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-03-04 21:48:50 +00:00
parent da2e0f27de
commit ddffcdf328
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -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

18
src/Fl_Help_View.cxx
View File

@ -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 $".
//