diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-03-15 23:47:47 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-03-15 23:47:47 +0000 |
| commit | 186a8f0ff123d3912e9993787f339750b74b0738 (patch) | |
| tree | 1965223b4ffd79a8348b41bafb2ec6963e520f58 /FL/Fl_Pixmap.H | |
| parent | 99e9c68215b0bc27a677762b70e69ca608ba00b1 (diff) | |
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
Diffstat (limited to 'FL/Fl_Pixmap.H')
| -rw-r--r-- | FL/Fl_Pixmap.H | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 0f43946cd..616add0f4 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -56,22 +56,27 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { public: int alloc_data; // Non-zero if data was allocated + + private: + #if defined(__APPLE__) || defined(WIN32) - void *id; // for internal use - void *mask; // for internal use (mask bitmap) + void *id_; // for internal use + void *mask_; // for internal use (mask bitmap) #else - unsigned id; // for internal use - unsigned mask; // for internal use (mask bitmap) + unsigned id_; // for internal use + unsigned mask_; // for internal use (mask bitmap) #endif // __APPLE__ || WIN32 + public: + /** The constructors create a new pixmap from the specified XPM data. */ - explicit Fl_Pixmap(char * const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();} + explicit Fl_Pixmap(char * const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();} /** The constructors create a new pixmap from the specified XPM data. */ - explicit Fl_Pixmap(uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();} + explicit Fl_Pixmap(uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();} /** The constructors create a new pixmap from the specified XPM data. */ - explicit Fl_Pixmap(const char * const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();} + explicit Fl_Pixmap(const char * const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();} /** The constructors create a new pixmap from the specified XPM data. */ - explicit Fl_Pixmap(const uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();} + explicit Fl_Pixmap(const uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();} virtual ~Fl_Pixmap(); virtual Fl_Image *copy(int W, int H); Fl_Image *copy() { return copy(w(), h()); } |