summaryrefslogtreecommitdiff
path: root/src/drivers/Wayland
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2022-05-05 18:57:07 +0200
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2022-05-05 18:57:07 +0200
commit217120c28190fb0c544a48b9dec984ca4e9bd327 (patch)
treecdb6afde9730db9dee99e9be694f96fdbd22d840 /src/drivers/Wayland
parent170a9d8e1fc00e55a2a9a13abc16107cbcecded0 (diff)
Move struct shape_data_type inside Fl_XXX_Window_Driver.
Diffstat (limited to 'src/drivers/Wayland')
-rw-r--r--src/drivers/Wayland/Fl_Wayland_Window_Driver.H13
-rw-r--r--src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx1
2 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H
index df4876ccc..4fdcd957b 100644
--- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H
+++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H
@@ -42,18 +42,17 @@
typedef struct _cairo_pattern cairo_pattern_t;
-struct Fl_Window_Driver::shape_data_type {
- int lw_; ///< width of shape image
- int lh_; ///< height of shape image
- Fl_Image* shape_; ///< shape image
- cairo_pattern_t *mask_pattern_;
-};
-
class FL_EXPORT Fl_Wayland_Window_Driver : public Fl_Window_Driver
{
friend class Fl_X;
private:
+ struct shape_data_type {
+ int lw_; ///< width of shape image
+ int lh_; ///< height of shape image
+ Fl_Image* shape_; ///< shape image
+ cairo_pattern_t *mask_pattern_;
+ } *shape_data_;
static bool in_flush; // useful for progressive window drawing
struct wl_cursor *cursor_;
void delete_cursor_();
diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
index 0f07082c5..e7377cc7f 100644
--- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
@@ -63,6 +63,7 @@ void Fl_Wayland_Window_Driver::destroy_double_buffer() {
Fl_Wayland_Window_Driver::Fl_Wayland_Window_Driver(Fl_Window *win) : Fl_Window_Driver(win)
{
+ shape_data_ = NULL;
cursor_ = NULL;
in_handle_configure = false;
screen_num_ = -1;