From 0d3a37439625e60cf247228412007fabd04ad289 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sat, 25 May 2019 11:59:16 +0200 Subject: Call virtual member Fl_Surface_Device::end_current() when necessary Rename member function Fl_Surface_Device::end_current_() to end_current(), set it protected, and make it called by the destructor of all classes derived from Fl_Surface_Device that re-implement end_current(). This way, end_current() runs equally if Fl_Surface_Device()::pop_current() is called before or after the drawing surface is deleted. --- src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/drivers/GDI') diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx index bfb528490..5c03621cb 100644 --- a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx @@ -24,7 +24,7 @@ #include class Fl_GDI_Image_Surface_Driver : public Fl_Image_Surface_Driver { - virtual void end_current_(); + virtual void end_current(); public: Window pre_window; int _savedc; @@ -61,6 +61,7 @@ Fl_GDI_Image_Surface_Driver::Fl_GDI_Image_Surface_Driver(int w, int h, int high_ Fl_GDI_Image_Surface_Driver::~Fl_GDI_Image_Surface_Driver() { if (offscreen && !external_offscreen) DeleteObject(offscreen); + if (is_current()) end_current(); delete driver(); } @@ -93,7 +94,7 @@ Fl_RGB_Image* Fl_GDI_Image_Surface_Driver::image() } -void Fl_GDI_Image_Surface_Driver::end_current_() +void Fl_GDI_Image_Surface_Driver::end_current() { HDC gc = (HDC)driver()->gc(); GetWindowOrgEx(gc, &origin); -- cgit v1.2.3