Move ifdef's in RGB_Image into driver system.

- change image caching variable types to uintptr_t
- added driver function to uncache image data
- cleaning up (Xlib and GDI will likely throw syntax errors. Trying to fix ASAP)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11138 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 7 insertions, 20 deletions

diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index 65f056b84..12e917978 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -49,33 +49,20 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image {
   int prepare(int XP, int YP, int WP, int HP, int &cx, int &cy,
 			 int &X, int &Y, int &W, int &H);
 
-  protected:
+protected:
 
   void measure();
 
-  public:
+public:
 
   int alloc_data; // Non-zero if data was allocated
   
-  private:
+private:
+  // for internal use
+  fl_uintptr_t id_;
+  fl_uintptr_t mask_;
 
-#if defined(WIN32)
-  UINT pixmap_bg_color; // RGB color used for pixmap background
-  void *id_; // for internal use
-  void *mask_; // for internal use (mask bitmap)
-#elif defined(__APPLE__)
-  void *id_; // for internal use
-  void *mask_; // for internal use (mask bitmap)
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: define member variables to store an RGB image and a mask for Fl_Pixmap"
-  void *id_;   // don't use
-  void *mask_; // don't use
-#else
-  unsigned id_; // for internal use
-  unsigned mask_; // for internal use (mask bitmap)
-#endif // __APPLE__ || WIN32
-  
-  public:
+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();}