remove no longer necessary widget deletion code

MoAlyousef · Jan 4, 2025 · 840b0f2 · 840b0f2
1 parent 536b5e2
commit 840b0f2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 41 deletions.
diff --git a/fltk b/fltk
diff --git a/include/cfl_widget.hpp b/include/cfl_widget.hpp
@@ -113,46 +113,22 @@ struct Widget_Derived : public T {
         if (deleter2 && deleter_data_) {
             deleter2(this, deleter_data_);
         } else if (deleter) {
-            if (!Fl::wait()) {
-                resize_handler = nullptr;
-                inner_handler  = nullptr;
-                if (ev_data_)
-                    deleter(ev_data_);
-                ev_data_ = nullptr;
-                if (resize_data_)
-                    deleter(resize_data_);
-                resize_data_ = nullptr;
-                if (draw_data_)
-                    deleter(draw_data_);
-                draw_data_   = nullptr;
-                inner_drawer = nullptr;
-                if (this->user_data())
-                    deleter(this->user_data());
-                this->user_data(nullptr);
-                this->callback((void (*)(Fl_Widget *, void *)) nullptr);
-            } else {
-                void *d[4] = {
-                    this->user_data(),
-                    this->ev_data_,
-                    this->draw_data_,
-                    this->resize_data_
-                };
-                auto data     = new Deleter{};
-                data->deleter = deleter;
-                memcpy(data->d, d, sizeof(d));
-                Fl::add_timeout(
-                    0.0001,
-                    [](void *d) {
-                        auto w = (Deleter *)d;
-                        for (auto &i : w->d) {
-                            if (i)
-                                w->deleter(i);
-                        }
-                        delete w;
-                    },
-                    data
-                );
-            }
+            resize_handler = nullptr;
+            inner_handler  = nullptr;
+            if (ev_data_)
+                deleter(ev_data_);
+            ev_data_ = nullptr;
+            if (resize_data_)
+                deleter(resize_data_);
+            resize_data_ = nullptr;
+            if (draw_data_)
+                deleter(draw_data_);
+            draw_data_   = nullptr;
+            inner_drawer = nullptr;
+            if (this->user_data())
+                deleter(this->user_data());
+            this->user_data(nullptr);
+            this->callback((void (*)(Fl_Widget *, void *)) nullptr);
         }
     }
 };