From 21c0134931ef22d6645fc182d7812776e14e369d Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sat, 23 Feb 2019 10:21:27 +0100 Subject: New member function const Fl_Image* Fl_Window::shape() replaces int Fl_Window::is_shaped() The new function allows to get the window's shaping image and delete it after use, if appropriate. --- src/Fl_Screen_Driver.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Fl_Screen_Driver.cxx') diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx index 4255d6444..44c92a5c7 100644 --- a/src/Fl_Screen_Driver.cxx +++ b/src/Fl_Screen_Driver.cxx @@ -330,7 +330,7 @@ void Fl_Screen_Driver::rescale_all_windows_from_screen(int screen, float f) static void del_transient_window(void *data) { Fl_Window *win = (Fl_Window*)data; - delete (Fl_RGB_Image*)win->child(0)->user_data(); + delete (Fl_Image*)win->shape(); Fl::delete_widget(win); } @@ -369,7 +369,6 @@ void Fl_Screen_Driver::transient_scale_display(float f, int nscreen) b->color(Fl_Tooltip::color()); win->end(); win->shape(img); - b->user_data(img); win->user_data((void*)&transient_scale_display); // prevent this window from being rescaled later win->set_output(); win->set_non_modal(); -- cgit v1.2.3