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/WinAPI | |
| parent | 170a9d8e1fc00e55a2a9a13abc16107cbcecded0 (diff) | |
Move struct shape_data_type inside Fl_XXX_Window_Driver.
Diffstat (limited to 'src/drivers/WinAPI')
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H | 12 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H index 356eb8297..6c169f0b1 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H @@ -42,12 +42,6 @@ */ -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_WinAPI_Window_Driver : public Fl_Window_Driver { @@ -58,6 +52,12 @@ class FL_EXPORT Fl_WinAPI_Window_Driver : public Fl_Window_Driver HICON big_icon; HICON small_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_; int screen_num_; private: void shape_bitmap_(Fl_Image* b); diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index ab4bbfdee..459143dad 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -39,6 +39,7 @@ Fl_WinAPI_Window_Driver::Fl_WinAPI_Window_Driver(Fl_Window *win) : Fl_Window_Driver(win) { icon_ = new icon_data; + shape_data_ = NULL; memset(icon_, 0, sizeof(icon_data)); cursor = NULL; screen_num_ = -1; |