diff options
Diffstat (limited to 'src/drivers/Android')
| -rw-r--r-- | src/drivers/Android/Fl_Android_Window_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/Android/Fl_Android_Window_Driver.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/Android/Fl_Android_Window_Driver.H b/src/drivers/Android/Fl_Android_Window_Driver.H index aebf2ebf2..4f92c8283 100644 --- a/src/drivers/Android/Fl_Android_Window_Driver.H +++ b/src/drivers/Android/Fl_Android_Window_Driver.H @@ -48,7 +48,7 @@ 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 *todelete_; ///< auxiliary bitmap image + Fl_Bitmap *effective_bitmap_; ///< auxiliary bitmap image }; class FL_EXPORT Fl_Android_Window_Driver : public Fl_Window_Driver diff --git a/src/drivers/Android/Fl_Android_Window_Driver.cxx b/src/drivers/Android/Fl_Android_Window_Driver.cxx index 7cd4b34f9..1c845c7c6 100644 --- a/src/drivers/Android/Fl_Android_Window_Driver.cxx +++ b/src/drivers/Android/Fl_Android_Window_Driver.cxx @@ -244,7 +244,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_; @@ -377,12 +377,12 @@ 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; } 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; |