diff options
| author | Manolo Gouy <Manolo> | 2012-03-28 13:19:33 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2012-03-28 13:19:33 +0000 |
| commit | ae4d6338b8c9001640e8799b82b3f672211c9b64 (patch) | |
| tree | dfe59649c025faeb140e91ca2f795ff263bf5a0d /FL | |
| parent | 0b6f546b0f816d63b7b0edc2af410448a83d7440 (diff) | |
WIN32: Fl_Pixmap printing uses a global variable called win_pixmap_bg_color equal to the color
used for the pixmap background, and treats this color as transparent. FLTK assigns to this variable
a color unused by the processed pixmap. In theory this variable should be specific to each processed
pixmap. In practice, it's very unlikely that several values are needed. A new member variable is
added to the Fl_Pixmap object to hold this value. This member is made static if FLTK_ABI_VERSION
< 10302 for ABI compatibility. The correct thing, though, is for a non-static member.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9308 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Pixmap.H | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 62980d0a2..f920961e8 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -22,6 +22,9 @@ #ifndef Fl_Pixmap_H #define Fl_Pixmap_H # include "Fl_Image.H" +#if defined(WIN32) +# include "x.H" +#endif class Fl_Widget; struct Fl_Menu_Item; @@ -56,6 +59,12 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { private: +#if defined(WIN32) +#if FLTK_ABI_VERSION < 10302 + static // a static member is needed for ABI compatibility +#endif + UINT pixmap_bg_color; // RGB color used for pixmap background +#endif // WIN32 #if defined(__APPLE__) || defined(WIN32) void *id_; // for internal use void *mask_; // for internal use (mask bitmap) |