diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-05-05 18:57:07 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-05-05 18:57:07 +0200 |
| commit | 217120c28190fb0c544a48b9dec984ca4e9bd327 (patch) | |
| tree | cdb6afde9730db9dee99e9be694f96fdbd22d840 /src/drivers/X11 | |
| parent | 170a9d8e1fc00e55a2a9a13abc16107cbcecded0 (diff) | |
Move struct shape_data_type inside Fl_XXX_Window_Driver.
Diffstat (limited to 'src/drivers/X11')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.H | 14 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.cxx | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H index a8224e8e1..b140441fd 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -44,14 +44,6 @@ class Fl_Bitmap; */ - -struct Fl_Window_Driver::shape_data_type { - int lw_; ///< width of shape image - int lh_; ///< height of shape image - Fl_Image* shape_; ///< shape image - Fl_Bitmap *effective_bitmap_; ///< auxiliary bitmap image -}; - class FL_EXPORT Fl_X11_Window_Driver : public Fl_Window_Driver { friend class Fl_X; @@ -63,6 +55,12 @@ private: Fl_RGB_Image **icons; int count; } *icon_; + struct shape_data_type { + int lw_; ///< width of shape image + int lh_; ///< height of shape image + Fl_Image* shape_; ///< shape image + Fl_Bitmap *effective_bitmap_; ///< auxiliary bitmap image + } *shape_data_; #if USE_XFT // --- support for screen-specific scaling factors struct type_for_resize_window_between_screens { diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index 725f8f5e0..ed9dd8fcb 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -48,6 +48,7 @@ Fl_X11_Window_Driver::Fl_X11_Window_Driver(Fl_Window *win) : Fl_Window_Driver(win) { icon_ = new icon_data; + shape_data_ = NULL; memset(icon_, 0, sizeof(icon_data)); #if USE_XFT screen_num_ = -1; |