diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-02-09 18:25:02 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-02-09 18:25:02 +0000 |
| commit | 41e22f2f39f6b9a53d5248669e531e6c8e36a421 (patch) | |
| tree | 48dd8a971667ae53be38524e3d4d27fa92ded326 /FL/Fl_Bitmap.H | |
| parent | dee0f5a82452da4334f269ceaee01f2d3df01bc0 (diff) | |
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
Diffstat (limited to 'FL/Fl_Bitmap.H')
| -rw-r--r-- | FL/Fl_Bitmap.H | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 4c8efb4d5..3bb6f23d1 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -21,7 +21,8 @@ #ifndef Fl_Bitmap_H #define Fl_Bitmap_H -# include "Fl_Image.H" +#include "Fl_Image.H" +#include "Fl_Widget.H" // for fl_uintptr_t class Fl_Widget; struct Fl_Menu_Item; @@ -45,16 +46,8 @@ public: private: int start(int XP, int YP, int WP, int HP, int &cx, int &cy, int &X, int &Y, int &W, int &H); -#if defined(__APPLE__) || defined(WIN32) /** for internal use */ - void *id_; -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: define variables to hold a native bitmap in Fl_Bitmap" - unsigned id_; // default if not ported -#else - /** for internal use */ - unsigned id_; -#endif // __APPLE__ || WIN32 + fl_uintptr_t id_; public: |