diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-04-13 19:07:40 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-04-13 19:07:40 +0000 |
| commit | b8a8c98f04c752e69c17f2709c7496489b839611 (patch) | |
| tree | 3eae855f2e104e207ecd36650ad9963a1c5f8ff4 /FL | |
| parent | bb86f132ebc530f9d06d441f7d13675efcef1322 (diff) | |
Eliminate all compiler warnings (string constants, const'ness, hiding of
class members, empty fl_call_main.c)
Update pixmap functions to accept const * const * or * const * pointers.
(confused? :)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1429 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Pixmap.H | 10 | ||||
| -rw-r--r-- | FL/fl_draw.H | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 82eb406a4..2c838e09c 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.H,v 1.6.2.3 2001/01/22 15:13:37 easysw Exp $" +// "$Id: Fl_Pixmap.H,v 1.6.2.4 2001/04/13 19:07:39 easysw Exp $" // // Pixmap header file for the Fast Light Tool Kit (FLTK). // @@ -30,12 +30,12 @@ class Fl_Widget; struct Fl_Menu_Item; struct Fl_Pixmap { - /*const*/ char * const * data; + const char * const * data; int w, h; // set by first draw... ulong id; // for internal use (the pixmap) ulong mask; // for internal use (mask bitmap) - Fl_Pixmap(/*const*/char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {} - Fl_Pixmap(/*const*/uchar* const * d) : data((char**)d), w(-1), h(0), id(0),mask(0) {} + Fl_Pixmap(const char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {} + Fl_Pixmap(const uchar* const * d) : data((char**)d), w(-1), h(0), id(0),mask(0) {} FL_EXPORT ~Fl_Pixmap(); FL_EXPORT void label(Fl_Widget*); FL_EXPORT void label(Fl_Menu_Item*); @@ -46,5 +46,5 @@ struct Fl_Pixmap { #endif // -// End of "$Id: Fl_Pixmap.H,v 1.6.2.3 2001/01/22 15:13:37 easysw Exp $". +// End of "$Id: Fl_Pixmap.H,v 1.6.2.4 2001/04/13 19:07:39 easysw Exp $". // diff --git a/FL/fl_draw.H b/FL/fl_draw.H index 6f6edfd95..7ebdec5c1 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -1,5 +1,5 @@ // -// "$Id: fl_draw.H,v 1.9.2.5 2001/01/22 15:13:38 easysw Exp $" +// "$Id: fl_draw.H,v 1.9.2.6 2001/04/13 19:07:40 easysw Exp $" // // Portable drawing function header file for the Fast Light Tool Kit (FLTK). // @@ -163,6 +163,8 @@ FL_EXPORT void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b); // pixmaps: FL_EXPORT int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,Fl_Color=FL_GRAY); FL_EXPORT int fl_measure_pixmap(/*const*/ char* const* data, int &w, int &h); +FL_EXPORT int fl_draw_pixmap(const char* const* data, int x,int y,Fl_Color=FL_GRAY); +FL_EXPORT int fl_measure_pixmap(const char* const* data, int &w, int &h); // other: extern FL_EXPORT void fl_scroll(int X, int Y, int W, int H, int dx, int dy, @@ -179,5 +181,5 @@ FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scal #endif // -// End of "$Id: fl_draw.H,v 1.9.2.5 2001/01/22 15:13:38 easysw Exp $". +// End of "$Id: fl_draw.H,v 1.9.2.6 2001/04/13 19:07:40 easysw Exp $". // |