Rename member todelete_ of struct Fl_Window_Driver::shape_data_type to effective_bitmap_

6 files changed, 14 insertions, 14 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;
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index eabca3522..e9c35d62b 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_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_WinAPI_Window_Driver : public Fl_Window_Driver
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
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index 0cef4d07f..604b7d622 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -51,7 +51,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_X11_Window_Driver : public Fl_Window_Driver
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index 7a75e8188..d4c1958a4 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -138,7 +138,7 @@ Fl_X11_Window_Driver::Fl_X11_Window_Driver(Fl_Window *win)
 Fl_X11_Window_Driver::~Fl_X11_Window_Driver()
 {
   if (shape_data_) {
-    delete shape_data_->todelete_;
+    delete shape_data_->effective_bitmap_;
     delete shape_data_;
   }
   delete icon_;
@@ -290,13 +290,13 @@ void Fl_X11_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_X11_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;
@@ -337,7 +337,7 @@ void Fl_X11_Window_Driver::combine_mask()
   float s = Fl::screen_driver()->scale(screen_num());
   shape_data_->lw_ = w()*s;
   shape_data_->lh_ = h()*s;
-  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_);
   Pixmap pbitmap = XCreateBitmapFromData(fl_display, fl_xid(pWindow),
                                          (const char*)*temp->data(),