diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Graphics_Driver.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Pixmap.H | 1 | ||||
| -rw-r--r-- | FL/Fl_System_Driver.H | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H index c7ba46f15..8322c348f 100644 --- a/FL/Fl_Graphics_Driver.H +++ b/FL/Fl_Graphics_Driver.H @@ -86,6 +86,7 @@ class FL_EXPORT Fl_Graphics_Driver { friend void fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D); friend void fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D); friend void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy); + 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); @@ -137,6 +138,8 @@ private: virtual void draw_fixed(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP, int cx, int cy) {} virtual void draw_fixed(Fl_Bitmap *bm,int XP, int YP, int WP, int HP, int cx, int cy) {} virtual void draw_fixed(Fl_RGB_Image *rgb,int XP, int YP, int WP, int HP, int cx, int cy) {} + // the default implementation of make_unused_color_() is most probably enough + virtual void make_unused_color_(unsigned char &r, unsigned char &g, unsigned char &b) {} // some platforms may need to reimplement this virtual void set_current_(); protected: @@ -259,13 +262,12 @@ protected: pwidth = &(rgb->cache_w_); pheight = &(rgb->cache_h_); } - /** Accessor to a private member variable of Fl_Pixmap */ - static Fl_Color* pixmap_bg_color(Fl_Pixmap *pm) {return &(pm->pixmap_bg_color);} /** For internal library use only */ static void draw_empty(Fl_Image* img, int X, int Y) {img->draw_empty(X, Y);} Fl_Graphics_Driver(); void cache_size(Fl_Image *img, int &width, int &height); + static unsigned need_pixmap_bg_color; public: virtual ~Fl_Graphics_Driver() {} ///< Destructor static Fl_Graphics_Driver &default_driver(); diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index b6eb178d1..384a25b22 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -52,7 +52,6 @@ private: // for internal use fl_uintptr_t id_; fl_uintptr_t mask_; - Fl_Color pixmap_bg_color; int cache_w_, cache_h_; // size of pixmap when cached public: diff --git a/FL/Fl_System_Driver.H b/FL/Fl_System_Driver.H index ce4ba5129..5b4f6231f 100644 --- a/FL/Fl_System_Driver.H +++ b/FL/Fl_System_Driver.H @@ -173,9 +173,6 @@ public: virtual void* thread_message() {return NULL;} // implement to support Fl_File_Icon virtual int file_type(const char *filename); - // the default implementations of pixmap_extra_transparent_processing() and make_unused_color() and are most probably enough - virtual int pixmap_extra_transparent_processing() {return 0;} - virtual void make_unused_color(unsigned char &r, unsigned char &g, unsigned char &b) {} // implement to return the user's home directory name virtual const char *home_directory_name() { return ""; } // the default implementation is most probably enough |