From b73ff860cc44217e642335ef61ce8c1ee418eeb9 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 1 May 2018 17:09:15 +0000 Subject: Make virtual void Fl_Surface_Device::end_current_() have no argument because none is used. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12889 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Device.cxx | 2 +- src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx | 4 ++-- src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx | 4 ++-- src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx | 4 ++-- src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx index 37aa804ac..6c73ea04a 100644 --- a/src/Fl_Device.cxx +++ b/src/Fl_Device.cxx @@ -50,7 +50,7 @@ is Fl_Surface_Device::push_current( ) / Fl_Surface_Device::pop_current().*/ void Fl_Surface_Device::set_current(void) { - if (surface_) surface_->end_current_(this); + if (surface_) surface_->end_current_(); fl_graphics_driver = pGraphicsDriver; surface_ = this; pGraphicsDriver->global_gc(); diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx index 9a037084f..b51426506 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_(Fl_Surface_Device*); + virtual void end_current_(); public: Window pre_window; int _savedc; @@ -93,7 +93,7 @@ Fl_RGB_Image* Fl_GDI_Image_Surface_Driver::image() } -void Fl_GDI_Image_Surface_Driver::end_current_(Fl_Surface_Device*) +void Fl_GDI_Image_Surface_Driver::end_current_() { HDC gc = (HDC)driver()->gc(); GetWindowOrgEx(gc, &origin); diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx index 4eae3d58f..2c61e6089 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx @@ -28,7 +28,7 @@ class Fl_Quartz_Image_Surface_Driver : public Fl_Image_Surface_Driver { friend class Fl_Image_Surface; - virtual void end_current_(Fl_Surface_Device*); + virtual void end_current_(); public: Window pre_window; Fl_Quartz_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off); @@ -113,7 +113,7 @@ Fl_RGB_Image* Fl_Quartz_Image_Surface_Driver::image() return image; } -void Fl_Quartz_Image_Surface_Driver::end_current_(Fl_Surface_Device*) +void Fl_Quartz_Image_Surface_Driver::end_current_() { fl_window = pre_window; } diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx index 74a5022f4..67ebc5c66 100644 --- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx @@ -28,7 +28,7 @@ class Fl_Xlib_Copy_Surface_Driver : public Fl_Copy_Surface_Driver { friend class Fl_Copy_Surface_Driver; - virtual void end_current_(Fl_Surface_Device*); + virtual void end_current_(); protected: Fl_Offscreen xid; Window oldwindow; @@ -82,7 +82,7 @@ void Fl_Xlib_Copy_Surface_Driver::set_current() { fl_window = xid; } -void Fl_Xlib_Copy_Surface_Driver::end_current_(Fl_Surface_Device*) { +void Fl_Xlib_Copy_Surface_Driver::end_current_() { fl_window = oldwindow; } diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx index 2e6250fc1..a31dc8d5f 100644 --- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx @@ -21,7 +21,7 @@ #include class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver { - virtual void end_current_(Fl_Surface_Device *next_current); + virtual void end_current_(); public: Window pre_window; Fl_Xlib_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off); @@ -77,7 +77,7 @@ Fl_RGB_Image* Fl_Xlib_Image_Surface_Driver::image() return image; } -void Fl_Xlib_Image_Surface_Driver::end_current_(Fl_Surface_Device *next_current) +void Fl_Xlib_Image_Surface_Driver::end_current_() { fl_window = pre_window; } -- cgit v1.2.3