3 files changed, 7 insertions, 6 deletions
diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H
index b24ee8b0a..7c2c60b04 100644
--- a/FL/Fl_Copy_Surface.H
+++ b/FL/Fl_Copy_Surface.H
@@ -83,7 +83,6 @@ protected:
   virtual void untranslate() {}
   int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
   virtual Fl_RGB_Image *image() {return NULL;}
-  virtual void end_current() {}
   /** Each platform implements this function its own way.
    It returns an object implementing all virtual functions
    of class Fl_Copy_Surface_Driver for the plaform.
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index f443021c0..41e3a9fe7 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -52,13 +52,17 @@ class Fl_Widget;
  </ol>
  */
 class FL_EXPORT Fl_Surface_Device {
-  /** \brief The graphics driver in use by this surface. */
+  /** The graphics driver in use by this surface. */
   Fl_Graphics_Driver *pGraphicsDriver;
   static Fl_Surface_Device *_surface; // the surface that currently receives graphics output
   static Fl_Surface_Device *default_surface(); // create surface if none exists yet
+  static Fl_Surface_Device *pre_surface_;
+  // Some drawing surfaces (e.g., Fl_XXX_Image_Surface_Driver) need to re-implement this.
+  // Gets called each time a surface ceases to be the current drawing surface.
+  virtual void end_current_() {}
 protected:
-  /** \brief Constructor that sets the graphics driver to use for the created surface. */
-  Fl_Surface_Device(Fl_Graphics_Driver *graphics_driver) {pGraphicsDriver = graphics_driver; };
+  /** Constructor that sets the graphics driver to use for the created surface. */
+  Fl_Surface_Device(Fl_Graphics_Driver *graphics_driver) {pGraphicsDriver = graphics_driver; }
 public:
   virtual void set_current(void);
   /** \brief Sets the graphics driver of this drawing surface. */
diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H
index 887f86ac8..5c638915e 100644
--- a/FL/Fl_Image_Surface.H
+++ b/FL/Fl_Image_Surface.H
@@ -77,7 +77,6 @@ public:
   Fl_Image_Surface(int w, int h, int high_res = 0, Fl_Offscreen off = 0);
   ~Fl_Image_Surface();
   void set_current();
-  void end_current();
   Fl_RGB_Image *image();
   Fl_Shared_Image *highres_image();
   void origin(int *x, int *y);
@@ -106,7 +105,6 @@ protected:
   virtual void untranslate() {}
   int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
   virtual Fl_RGB_Image *image() {return NULL;}
-  virtual void end_current() {}
   /** Each platform implements this function its own way.
    It returns an object implementing all virtual functions
    of class Fl_Image_Surface_Driver for the plaform.