Remove platform-dependent type Fl_Bitmask (not in documented public API).

3 files changed, 3 insertions, 14 deletions

diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H
index 54cdf3d74..3eb669ee0 100644
--- a/FL/Fl_Graphics_Driver.H
+++ b/FL/Fl_Graphics_Driver.H
@@ -91,8 +91,6 @@ class FL_EXPORT Fl_Graphics_Driver {
   friend int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg);
   friend FL_EXPORT void gl_start();
   friend FL_EXPORT void gl_finish();
-  friend FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *array);
-  friend FL_EXPORT void fl_delete_bitmask(Fl_Bitmask);
   /* ============== Implementation note about image drawing =========================
    A graphics driver can implement up to 6 virtual member functions to draw images:
    virtual void draw_pixmap(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP, int cx, int cy)
@@ -132,7 +130,7 @@ and
 
    Graphics drivers also implement cache(Fl_Pixmap*), cache(Fl_Bitmap*) and cache(Fl_RGB_Image*)
    to compute the cached form of all image types, and uncache(Fl_RGB_Image *,...),
-   uncache_pixmap(fl_uintptr_t) and delete_bitmask(Fl_Bitmask) to destroy cached image forms.
+   uncache_pixmap(fl_uintptr_t) and delete_bitmask(fl_uintptr_t) to destroy cached image forms.
    Graphics drivers that use the mask_ variable of class Fl_Pixmap to cache an Fl_Pixmap
    object also reimplement the uchar **Fl_Graphics_Driver::mask_bitmap() member function.
    */
@@ -197,8 +195,6 @@ protected:
   virtual void draw_bitmap(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy);
   virtual void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy);
 
-  virtual Fl_Bitmask create_bitmask(int w, int h, const uchar *array);
-  virtual void delete_bitmask(Fl_Bitmask bm);
   /** For internal library use only */
   static void change_image_size(Fl_Image *img, int W, int H) {
     img->w(W);
@@ -378,6 +374,7 @@ public:
   virtual PangoFontDescription* pango_font_description(Fl_Font) { return NULL; }
   virtual void antialias(int state);
   virtual int antialias();
+  virtual void delete_bitmask(fl_uintptr_t bm);
 };
 
 #ifndef FL_DOXYGEN
diff --git a/FL/platform.H b/FL/platform.H
index 4b9d6d687..1ff9cd48c 100644
--- a/FL/platform.H
+++ b/FL/platform.H
@@ -74,9 +74,6 @@ extern FL_EXPORT Fl_Window* fl_find(Window xid);
 extern FL_EXPORT void fl_open_display();
 extern FL_EXPORT void fl_close_display();
 extern FL_EXPORT Window fl_window;
-extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
-extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
-extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm);
 extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
 extern FL_EXPORT void fl_open_callback(void (*)(const char *));
 
diff --git a/FL/platform_types.h b/FL/platform_types.h
index 5ea11f7f4..cb85214fb 100644
--- a/FL/platform_types.h
+++ b/FL/platform_types.h
@@ -33,7 +33,6 @@ typedef opaque fl_intptr_t;
 typedef opaque fl_uintptr_t;
 
 typedef opaque Fl_Offscreen; /**< an offscreen drawing buffer */
-typedef opaque Fl_Bitmask; /**< mask */
 typedef opaque Fl_Region; /**< a region made of several rectangles */
 typedef opaque FL_SOCKET; /**< socket or file descriptor */
 typedef opaque GLContext; /**< an OpenGL graphics context, into which all OpenGL calls are rendered */
@@ -50,7 +49,7 @@ typedef opaque GLContext; /**< an OpenGL graphics context, into which all OpenGL
 
 /* Platform-dependent types are defined here.
   These types must be defined by any platform:
-  Fl_Offscreen, Fl_Bitmask, Fl_Region, FL_SOCKET, GLContext, struct dirent, struct stat,
+  Fl_Offscreen, Fl_Region, FL_SOCKET, GLContext, struct dirent, struct stat,
   fl_intptr_t, fl_uintptr_t
 
   NOTE: *FIXME* AlbrechtS 13 Apr 2016 (concerning FL_SOCKET)
@@ -82,7 +81,6 @@ typedef unsigned long fl_uintptr_t;
 
 #ifdef __APPLE__
 typedef struct CGContext* Fl_Offscreen;
-typedef struct CGImage* Fl_Bitmask;
 typedef struct flCocoaRegion* Fl_Region;
 typedef int FL_SOCKET;
 #ifdef __OBJC__
@@ -101,7 +99,6 @@ typedef int FL_SOCKET;
 #elif defined(_WIN32)
 typedef struct HBITMAP__ *HBITMAP;
 typedef HBITMAP Fl_Offscreen;
-typedef HBITMAP Fl_Bitmask;
 typedef struct HRGN__ *Fl_Region;
 # if defined(_WIN64) && defined(_MSC_VER)
 typedef  unsigned __int64 FL_SOCKET;    /* *FIXME* - FL_SOCKET (see above) */
@@ -118,7 +115,6 @@ typedef struct HGLRC__ *GLContext;
 
 #elif defined(FLTK_USE_WAYLAND)
 typedef struct fl_wld_buffer *Fl_Offscreen; /**< an offscreen drawing buffer */
-typedef struct _cairo_pattern* Fl_Bitmask;
 typedef struct flWaylandRegion* Fl_Region;
 typedef int FL_SOCKET; /**< socket or file descriptor */
 typedef void *EGLContext;
@@ -130,7 +126,6 @@ typedef EGLContext GLContext;
 #elif defined(FLTK_USE_X11)
 
 typedef unsigned long Fl_Offscreen;
-typedef unsigned long Fl_Bitmask;
 typedef struct _XRegion *Fl_Region;
 typedef int FL_SOCKET;
 typedef struct __GLXcontextRec *GLContext;