From a74795bbb88ffee1cc35144466c161f2bf585e1f Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 19 Nov 2002 16:37:36 +0000 Subject: Get rid of some valid compiler warnings with CodeWarrior that were reported by Paul Chambers. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2845 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_File_Icon.H | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'FL/Fl_File_Icon.H') diff --git a/FL/Fl_File_Icon.H b/FL/Fl_File_Icon.H index e1aa5404e..0291720c5 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.7 2002/08/14 16:49:38 easysw Exp $" +// "$Id: Fl_File_Icon.H,v 1.1.2.8 2002/11/19 16:37:33 easysw Exp $" // // Fl_File_Icon definitions. // @@ -80,26 +80,26 @@ class FL_EXPORT Fl_File_Icon //// Icon data Fl_File_Icon(const char *p, int t, int nd = 0, short *d = 0); ~Fl_File_Icon(); - short *add(short d); - short *add_color(Fl_Color c) - { short *d = add(COLOR); add(c >> 16); add(c); return (d); } - short *add_vertex(int x, int y) - { short *d = add(VERTEX); add(x); add(y); return (d); } - short *add_vertex(float x, float y) - { short *d = add(VERTEX); add((int)(x * 10000.0)); - add((int)(y * 10000.0)); return (d); } - void clear() { num_data_ = 0; } - void draw(int x, int y, int w, int h, Fl_Color ic, int active = 1); - void label(Fl_Widget *w); + short *add(short d); + short *add_color(Fl_Color c) + { short *d = add((short)COLOR); add((short)(c >> 16)); add((short)c); return (d); } + short *add_vertex(int x, int y) + { short *d = add((short)VERTEX); add((short)x); add((short)y); return (d); } + short *add_vertex(float x, float y) + { short *d = add((short)VERTEX); add((short)(x * 10000.0)); + add((short)(y * 10000.0)); return (d); } + void clear() { num_data_ = 0; } + void draw(int x, int y, int w, int h, Fl_Color ic, int active = 1); + void label(Fl_Widget *w); static void labeltype(const Fl_Label *o, int x, int y, int w, int h, Fl_Align a); - void load(const char *f); + void load(const char *f); int load_fti(const char *fti); int load_image(const char *i); - Fl_File_Icon *next() { return (next_); } - const char *pattern() { return (pattern_); } - int size() { return (num_data_); } - int type() { return (type_); } - short *value() { return (data_); } + Fl_File_Icon *next() { return (next_); } + const char *pattern() { return (pattern_); } + int size() { return (num_data_); } + int type() { return (type_); } + short *value() { return (data_); } static Fl_File_Icon *find(const char *filename, int filetype = ANY); static Fl_File_Icon *first() { return (first_); } @@ -109,5 +109,5 @@ class FL_EXPORT Fl_File_Icon //// Icon data #endif // !_Fl_Fl_File_Icon_H_ // -// End of "$Id: Fl_File_Icon.H,v 1.1.2.7 2002/08/14 16:49:38 easysw Exp $". +// End of "$Id: Fl_File_Icon.H,v 1.1.2.8 2002/11/19 16:37:33 easysw Exp $". // -- cgit v1.2.3