From 186a8f0ff123d3912e9993787f339750b74b0738 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Mon, 15 Mar 2010 23:47:47 +0000 Subject: Renamed internal member variables id and mask to id_ and mask_ to avoid conflict with Mac OS X/gcc 3.x name clash when compiling with obj-c. Also made them private instead of public. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7273 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Bitmap.H | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'FL/Fl_Bitmap.H') 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()); } -- cgit v1.2.3