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_Browser.H | 18 +++++++++--------- FL/Fl_File_Icon.H | 38 +++++++++++++++++++------------------- FL/Fl_Input_.H | 14 +++++++------- FL/forms.H | 6 +++--- 4 files changed, 38 insertions(+), 38 deletions(-) (limited to 'FL') diff --git a/FL/Fl_File_Browser.H b/FL/Fl_File_Browser.H index b78976b98..b48fa96d0 100644 --- a/FL/Fl_File_Browser.H +++ b/FL/Fl_File_Browser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Browser.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $" +// "$Id: Fl_File_Browser.H,v 1.1.2.5 2002/11/19 16:37:33 easysw Exp $" // // FileBrowser definitions. // @@ -57,23 +57,23 @@ public: Fl_File_Browser(int, int, int, int, const char * = 0); - uchar iconsize() const { return (iconsize_); }; - void iconsize(uchar s) { iconsize_ = s; redraw(); }; + uchar iconsize() const { return (iconsize_); }; + void iconsize(uchar s) { iconsize_ = s; redraw(); }; void filter(const char *pattern); - const char *filter() const { return (pattern_); }; + const char *filter() const { return (pattern_); }; int load(const char *directory, Fl_File_Sort_F *sort = fl_numericsort); - uchar textsize() const { return (Fl_Browser::textsize()); }; - void textsize(uchar s) { Fl_Browser::textsize(s); iconsize_ = 3 * s / 2; }; + uchar textsize() const { return (Fl_Browser::textsize()); }; + void textsize(uchar s) { Fl_Browser::textsize(s); iconsize_ = (uchar)(3 * s / 2); }; - int filetype() const { return (filetype_); }; - void filetype(int t) { filetype_ = t; load(directory_); }; + int filetype() const { return (filetype_); }; + void filetype(int t) { filetype_ = t; load(directory_); }; }; #endif // !_Fl_File_Browser_H_ // -// End of "$Id: Fl_File_Browser.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $". +// End of "$Id: Fl_File_Browser.H,v 1.1.2.5 2002/11/19 16:37:33 easysw Exp $". // 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 $". // diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H index b2edc0f68..1ca161e3f 100644 --- a/FL/Fl_Input_.H +++ b/FL/Fl_Input_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_.H,v 1.6.2.4.2.6 2002/08/14 16:49:38 easysw Exp $" +// "$Id: Fl_Input_.H,v 1.6.2.4.2.7 2002/11/19 16:37:33 easysw Exp $" // // Input base class header file for the Fast Light Tool Kit (FLTK). // @@ -126,17 +126,17 @@ public: void cursor_color(unsigned n) {cursor_color_ = n;} int input_type() const {return type() & FL_INPUT_TYPE; } - void input_type(int t) { type(t | readonly()); } + void input_type(int t) { type((uchar)(t | readonly())); } int readonly() const { return type() & FL_INPUT_READONLY; } - void readonly(int b) { if (b) type(type() | FL_INPUT_READONLY); - else type(type() & ~FL_INPUT_READONLY); } + void readonly(int b) { if (b) type((uchar)(type() | FL_INPUT_READONLY)); + else type((uchar)(type() & ~FL_INPUT_READONLY)); } int wrap() const { return type() & FL_INPUT_WRAP; } - void wrap(int b) { if (b) type(type() | FL_INPUT_WRAP); - else type(type() & ~FL_INPUT_WRAP); } + void wrap(int b) { if (b) type((uchar)(type() | FL_INPUT_WRAP)); + else type((uchar)(type() & ~FL_INPUT_WRAP)); } }; #endif // -// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.6 2002/08/14 16:49:38 easysw Exp $". +// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.7 2002/11/19 16:37:33 easysw Exp $". // diff --git a/FL/forms.H b/FL/forms.H index ccd744567..2aa166577 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -1,5 +1,5 @@ // -// "$Id: forms.H,v 1.7.2.7.2.6 2002/08/14 16:49:38 easysw Exp $" +// "$Id: forms.H,v 1.7.2.7.2.7 2002/11/19 16:37:33 easysw Exp $" // // Forms emulation header file for the Fast Light Tool Kit (FLTK). // @@ -615,7 +615,7 @@ inline void fl_get_dial_bounds(Fl_Widget* o, float* a, float* b) { inline void fl_set_dial_return(Fl_Widget* o, int i) { ((Fl_Dial*)o)->when((Fl_When)(i|FL_WHEN_RELEASE));} inline void fl_set_dial_angles(Fl_Widget* o, int a, int b) { - ((Fl_Dial*)o)->angles(a, b);} + ((Fl_Dial*)o)->angles((short)a, (short)b);} //inline void fl_set_dial_cross(Fl_Widget* o, int); // inline void fl_set_dial_direction(Fl_Widget* o, uchar d) { // ((Fl_Dial*)o)->direction(d);} @@ -838,5 +838,5 @@ inline void fl_draw() {Fl::flush();} #endif /* define __FORMS_H__ */ // -// End of "$Id: forms.H,v 1.7.2.7.2.6 2002/08/14 16:49:38 easysw Exp $". +// End of "$Id: forms.H,v 1.7.2.7.2.7 2002/11/19 16:37:33 easysw Exp $". // -- cgit v1.2.3