fix tree open_icon and close_icon

MoAlyousef · Jul 9, 2024 · d027944 · d027944
1 parent 4d16c7f
commit d027944
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/fltk b/fltk
diff --git a/src/cfl_image.cpp b/src/cfl_image.cpp
@@ -244,8 +244,8 @@ int Fl_Anim_GIF_Image_playing(const Fl_Anim_GIF_Image *self) {
 IMAGE_DEFINE(Fl_Pixmap)
 
 Fl_Pixmap *Fl_Pixmap_new(const char *const *D) {
-    LOCK(auto ret = new Fl_Pixmap(D));
-    return ret;
+    LOCK(auto temp = new Fl_Pixmap(D); auto ret = temp->copy(temp->w(), temp->h()); delete temp);
+    return (Fl_Pixmap *)ret;
 }
 
 IMAGE_DEFINE(Fl_XPM_Image)

diff --git a/src/cfl_tree.cpp b/src/cfl_tree.cpp
@@ -416,9 +416,7 @@ void *Fl_Tree_openicon(const Fl_Tree *self) {
 }
 
 void Fl_Tree_set_openicon(Fl_Tree *self, void *val) {
-    LOCK(auto old = self->openicon(); if (!val) self->openicon(nullptr);
-         else self->openicon(((Fl_Image *)val)->copy());
-         )
+    LOCK(self->openicon(((Fl_Image *)val)->copy()));
 }
 
 void *Fl_Tree_closeicon(const Fl_Tree *self) {
@@ -430,9 +428,7 @@ void *Fl_Tree_closeicon(const Fl_Tree *self) {
 }
 
 void Fl_Tree_set_closeicon(Fl_Tree *self, void *val) {
-    LOCK(auto old = self->closeicon(); if (!val) self->closeicon(nullptr);
-         else self->closeicon(((Fl_Image *)val)->copy());
-         )
+    LOCK(self->closeicon(((Fl_Image *)val)->copy()));
 }
 
 int Fl_Tree_showcollapse(const Fl_Tree *self) {