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, 15 deletions

diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index 6c44c94aa..5dad09c01 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -20,10 +20,11 @@
    Fl_Image, Fl_RGB_Image classes. */
 
 #ifndef Fl_Image_H
-#  define Fl_Image_H
+#define Fl_Image_H
 
-#  include "Enumerations.H"
+#include "Enumerations.H"
 #include <stdlib.h>
+#include "Fl_Widget.H" // for fl_uintptr_t
 
 class Fl_Widget;
 class Fl_Pixmap;
@@ -203,19 +204,10 @@ public:
   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)
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: define variables to hold an RGB image and a mask for Fl_RGB_Image"
-  unsigned id_; // don't use
-  unsigned mask_; // don't use
-#else
-  unsigned id_; // for internal use
-  unsigned mask_; // for internal use (mask bitmap)
-#endif // __APPLE__ || WIN32
+private:
+  // These two variables are used to cache the image and mask for the main display graphics driver
+  fl_uintptr_t id_;
+  fl_uintptr_t mask_;
 
 public: