diff options
Diffstat (limited to 'FL/Fl_Pixmap.H')
| -rw-r--r-- | FL/Fl_Pixmap.H | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index b663f755b..31d99c673 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.H,v 1.6.2.8 2001/06/07 13:16:08 easysw Exp $" +// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.1 2001/08/05 23:58:54 easysw Exp $" // // Pixmap header file for the Fast Light Tool Kit (FLTK). // @@ -25,33 +25,33 @@ #ifndef Fl_Pixmap_H #define Fl_Pixmap_H +# include "Fl_Image.H" class Fl_Widget; struct Fl_Menu_Item; -// Older C++ compilers don't support the explicit keyword... :( -#if defined(__sgi) && !defined(_COMPILER_VERSION) -#define explicit -#endif // __sgi && !_COMPILER_VERSION +class FL_EXPORT Fl_Pixmap : public Fl_Image { + void measure(); + + public: -struct Fl_Pixmap { const char * const * data; - int w, h; // set by first draw... - ulong id; // for internal use (the pixmap) + ulong id; // for internal use ulong mask; // for internal use (mask bitmap) - explicit Fl_Pixmap(char * const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {} - explicit Fl_Pixmap(uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {} - explicit Fl_Pixmap(const char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {} - explicit Fl_Pixmap(const uchar* const * d) : data((const char*const*)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*); - FL_EXPORT void draw(int X, int Y, int W, int H, int cx=0, int cy=0); - void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);} + + explicit Fl_Pixmap(char * const * d) : Fl_Image(-1,0), data((const char*const*)d), id(0),mask(0) {measure();} + explicit Fl_Pixmap(uchar* const * d) : Fl_Image(-1,0), data((const char*const*)d), id(0),mask(0) {measure();} + explicit Fl_Pixmap(const char * const * d) : Fl_Image(-1,0), data(d), id(0),mask(0) {measure();} + explicit Fl_Pixmap(const uchar* const * d) : Fl_Image(-1,0), data((const char*const*)d), id(0),mask(0) {measure();} + virtual ~Fl_Pixmap(); + virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0); + void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} + virtual void label(Fl_Widget*w); + virtual void label(Fl_Menu_Item*m); }; #endif // -// End of "$Id: Fl_Pixmap.H,v 1.6.2.8 2001/06/07 13:16:08 easysw Exp $". +// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.1 2001/08/05 23:58:54 easysw Exp $". // |