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

3 files changed, 33 insertions, 17 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()); }
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index badc59467..72ee4477c 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -193,16 +193,21 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image {
   const uchar *array;
   int alloc_array; // Non-zero if array 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 constructor creates a new image from the specified data. */
   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), id(0), mask(0) {data((const char **)&array, 1); ld(LD);}
+    Fl_Image(W,H,D), array(bits), alloc_array(0), id_(0), mask_(0) {data((const char **)&array, 1); ld(LD);}
   virtual ~Fl_RGB_Image();
   virtual Fl_Image *copy(int W, int H);
   Fl_Image *copy() { return copy(w(), h()); }
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()); }