Moved fl_create_bitmask and fl_delete_bitmask functions into driver structure. Tested on OS X.

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

3 files changed, 13 insertions, 8 deletions

diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H
index 75d84370f..4c8efb4d5 100644
--- a/FL/Fl_Bitmap.H
+++ b/FL/Fl_Bitmap.H
@@ -42,7 +42,7 @@ public:
   /** Non-zero if array points to bitmap data allocated internally */
   int alloc_array;
   
-  private:
+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)
@@ -56,7 +56,7 @@ public:
   unsigned id_;
 #endif // __APPLE__ || WIN32
 
-  public:
+public:
 
   /** The constructors create a new bitmap from the specified bitmap data */
   Fl_Bitmap(const uchar *bits, int W, int H) :
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index 1c66ccd3f..597ffa7e2 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -239,22 +239,24 @@ public:
   virtual Fl_Font_Descriptor *font_descriptor() { return font_descriptor_;}
   virtual void font_descriptor(Fl_Font_Descriptor *d) { font_descriptor_ = d;}
   // --- implementation is in src/fl_image.cxx which includes src/drivers/xxx/Fl_xxx_Graphics_Driver_font.cxx
-  virtual   void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) {}
-  virtual   void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) {}
-  virtual   void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) {}
-  virtual   void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) {}
+  virtual Fl_Bitmask create_bitmask(int w, int h, const uchar *array) = 0;
+  virtual void delete_bitmask(Fl_Bitmask bm) = 0;
+  virtual void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) {}
+  virtual void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) {}
+  virtual void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) {}
+  virtual void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) {}
   /** \brief Draws an Fl_RGB_Image object to the device.
    *
    Specifies a bounding box for the image, with the origin (upper left-hand corner) of
    the image offset by the cx and cy arguments.
    */
-  virtual   void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) {}
+  virtual void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) {}
   /** \brief Draws an Fl_Pixmap object to the device.
    *
    Specifies a bounding box for the image, with the origin (upper left-hand corner) of
    the image offset by the cx and cy arguments.
    */
-  virtual   void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) {}
+  virtual void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) {}
   /** \brief Draws an Fl_Bitmap object to the device.
    *
    Specifies a bounding box for the image, with the origin (upper left-hand corner) of
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H
index 175a5f4e7..e749451df 100644
--- a/FL/Fl_PostScript.H
+++ b/FL/Fl_PostScript.H
@@ -222,6 +222,9 @@ class Clip {
   int draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP);
   int clocale_printf(const char *format, ...);
   ~Fl_PostScript_Graphics_Driver();
+  // ---
+  Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; }
+  void delete_bitmask(Fl_Bitmask bm) { };
 };
 
 /**