diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_File_Icon.H | 9 | ||||
| -rw-r--r-- | FL/Fl_Image.H | 14 |
2 files changed, 12 insertions, 11 deletions
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 $". // diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index 37298411d..e3331b9e8 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.H,v 1.5.2.3.2.6 2001/11/24 02:46:19 easysw Exp $" +// "$Id: Fl_Image.H,v 1.5.2.3.2.7 2001/11/25 16:38:10 easysw Exp $" // // Image header file for the Fast Light Tool Kit (FLTK). // @@ -32,7 +32,7 @@ class Fl_Widget; struct Fl_Menu_Item; class FL_EXPORT Fl_Image { - int w_, h_, d_, count_; + int w_, h_, d_, ld_, count_; const char * const *data_; protected: @@ -40,6 +40,7 @@ class FL_EXPORT Fl_Image { void w(int W) {w_ = W;} void h(int H) {h_ = H;} void d(int D) {d_ = D;} + void ld(int LD) {ld_ = LD;} void data(const char * const *p, int c) {data_ = p; count_ = c;} void draw_empty(int X, int Y); @@ -48,10 +49,11 @@ class FL_EXPORT Fl_Image { int w() const {return w_;} int h() const {return h_;} int d() const {return d_;} + int ld() const {return ld_;} int count() const {return count_;} const char * const *data() const {return data_;} - Fl_Image(int W, int H, int D) {w_ = W; h_ = H; d_ = D; count_ = 0; data_ = 0;} + Fl_Image(int W, int H, int D) {w_ = W; h_ = H; d_ = D; ld_ = 0; count_ = 0; data_ = 0;} virtual ~Fl_Image(); virtual Fl_Image *copy(int W, int H); Fl_Image *copy() { return copy(w(), h()); } @@ -69,12 +71,12 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { const uchar *array; int alloc_array; // Non-zero if array was allocated - int ld; + Fl_Offscreen id; // for internal use Fl_Bitmask mask; // for internal use (mask bitmap) Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) : - Fl_Image(W,H,D), array(bits), alloc_array(0), ld(LD), id(0), mask(0) {data(&((char *)array), 1);} + Fl_Image(W,H,D), array(bits), alloc_array(0), id(0), mask(0) {data(&((char *)array), 1); ld(LD);} virtual ~Fl_RGB_Image(); virtual Fl_Image *copy(int W, int H); Fl_Image *copy() { return copy(w(), h()); } @@ -89,5 +91,5 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { #endif // -// End of "$Id: Fl_Image.H,v 1.5.2.3.2.6 2001/11/24 02:46:19 easysw Exp $". +// End of "$Id: Fl_Image.H,v 1.5.2.3.2.7 2001/11/25 16:38:10 easysw Exp $". // |