From c147aca0541e9f45b1bd9c8eed4ec71cb1c650ec Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 25 Nov 2001 16:38:11 +0000 Subject: Add flstring.h header file to include string functions, strcasecmp definitions, and (v)snprintf function declarations... Fix Fl_File_Chooser so it always checks for an empty directory_ (so that is doesn't add the leading slash to drive letters and mount points) Make Fl_File_Icon use Fl_Shared_Image, and look in all KDE icon directories. Fl::error() no longer exits by default; only Fl::fatal() does... Wasn't doing callbacks in Fl_Tabs when the current tab was changed via the keyboard. FLUID wasn't writing the tooltips in message files, and didn't count tooltips when computing the message number for catgets. Update dependencies. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1729 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_File_Icon.H | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'FL/Fl_File_Icon.H') diff --git a/FL/Fl_File_Icon.H b/FL/Fl_File_Icon.H index 15260e14b..fc97d544d 100644 --- a/FL/Fl_File_Icon.H +++ b/FL/Fl_File_Icon.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Icon.H,v 1.1.2.3 2001/11/17 15:27:14 easysw Exp $" +// "$Id: Fl_File_Icon.H,v 1.1.2.4 2001/11/25 16:38:10 easysw Exp $" // // Fl_File_Icon definitions. // @@ -93,9 +93,8 @@ class Fl_File_Icon //// Icon data FL_EXPORT void label(Fl_Widget *w); FL_EXPORT static void labeltype(const Fl_Label *o, int x, int y, int w, int h, Fl_Align a); FL_EXPORT void load(const char *f); - FL_EXPORT void load_fti(const char *fti); - FL_EXPORT void load_png(const char *png); - FL_EXPORT void load_xpm(const char *xpm); + FL_EXPORT int load_fti(const char *fti); + FL_EXPORT int load_image(const char *i); const char *pattern() { return (pattern_); } int size() { return (num_data_); } int type() { return (type_); } @@ -109,5 +108,5 @@ class Fl_File_Icon //// Icon data #endif // !_Fl_Fl_File_Icon_H_ // -// End of "$Id: Fl_File_Icon.H,v 1.1.2.3 2001/11/17 15:27:14 easysw Exp $". +// End of "$Id: Fl_File_Icon.H,v 1.1.2.4 2001/11/25 16:38:10 easysw Exp $". // -- cgit v1.2.3