diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-02-23 10:30:48 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-02-23 10:30:48 +0100 |
| commit | a0510495ea258e55cb23f0599fac4da3c96299a8 (patch) | |
| tree | bdf36a0594d1179355a98a881025cecfa67fb887 /src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | |
| parent | 21c0134931ef22d6645fc182d7812776e14e369d (diff) | |
Rename member todelete_ of struct Fl_Window_Driver::shape_data_type to effective_bitmap_
Diffstat (limited to 'src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx')
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index 27263b374..78379712f 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -56,7 +56,7 @@ Fl_WinAPI_Window_Driver::Fl_WinAPI_Window_Driver(Fl_Window *win) Fl_WinAPI_Window_Driver::~Fl_WinAPI_Window_Driver() { if (shape_data_) { - delete shape_data_->todelete_; + delete shape_data_->effective_bitmap_; delete shape_data_; } delete icon_; @@ -178,13 +178,13 @@ void Fl_WinAPI_Window_Driver::shape_alpha_(Fl_Image* img, int offset) { Fl_Bitmap* bitmap = new Fl_Bitmap(bits, w, h); bitmap->alloc_array = 1; shape_bitmap_(bitmap); - shape_data_->todelete_ = bitmap; + shape_data_->effective_bitmap_ = bitmap; shape_data_->shape_ = img; } void Fl_WinAPI_Window_Driver::shape(const Fl_Image* img) { if (shape_data_) { - if (shape_data_->todelete_) { delete shape_data_->todelete_; } + if (shape_data_->effective_bitmap_) { delete shape_data_->effective_bitmap_; } } else { shape_data_ = new shape_data_type; @@ -289,7 +289,7 @@ void Fl_WinAPI_Window_Driver::draw_begin() // size of window has changed since last time shape_data_->lw_ = s*w(); shape_data_->lh_ = s*h(); - Fl_Image* temp = shape_data_->todelete_ ? shape_data_->todelete_ : shape_data_->shape_; + Fl_Image* temp = shape_data_->effective_bitmap_ ? shape_data_->effective_bitmap_ : shape_data_->shape_; temp = temp->copy(shape_data_->lw_, shape_data_->lh_); HRGN region = bitmap2region(temp); SetWindowRgn(fl_xid(pWindow), region, TRUE); // the system deletes the region when it's no longer needed |