diff options
Diffstat (limited to 'FL/Fl_Bitmap.H')
| -rw-r--r-- | FL/Fl_Bitmap.H | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 5ddc2856b..84ce3281b 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -46,19 +46,25 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { const uchar *array; /** Non-zero if array points to bitmap data allocated internally */ int alloc_array; + + private: + #if defined(__APPLE__) || defined(WIN32) /** for internal use */ - void *id; + void *id_; #else /** for internal use */ - unsigned id; + unsigned id_; #endif // __APPLE__ || WIN32 + + public: + /** The constructors create a new bitmap from the specified bitmap data */ Fl_Bitmap(const uchar *bits, int W, int H) : - Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((const char **)&array, 1);} + Fl_Image(W,H,0), array(bits), alloc_array(0), id_(0) {data((const char **)&array, 1);} /** The constructors create a new bitmap from the specified bitmap data */ Fl_Bitmap(const char *bits, int W, int H) : - Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id(0) {data((const char **)&array, 1);} + Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id_(0) {data((const char **)&array, 1);} virtual ~Fl_Bitmap(); virtual Fl_Image *copy(int W, int H); Fl_Image *copy() { return copy(w(), h()); } |
