From 85b5f02a8b84182f779c79e671b28c6dc3dd0c25 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Mon, 18 Apr 2016 11:58:46 +0000
Subject: Replace member function void Fl_X::flush() by virtual void
 Fl_Window_Driver::flush()

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11646 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Window_Driver.H | 1 +
 FL/mac.H              | 1 -
 FL/win32.H            | 1 -
 FL/x.H                | 2 --
 4 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'FL')

diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H
index db1f33f9f..62fe68637 100644
--- a/FL/Fl_Window_Driver.H
+++ b/FL/Fl_Window_Driver.H
@@ -102,6 +102,7 @@ public:
 
   // --- window management
   virtual void take_focus();
+  virtual void flush(); // the default implementation may be enough
   virtual void flush_double();
   virtual void flush_overlay();
   virtual void flush_single();
diff --git a/FL/mac.H b/FL/mac.H
index 1b39d2a08..fc8735101 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -134,7 +134,6 @@ public:
   static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;}
   static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&);
   static void make(Fl_Window*);
-  void flush();
   static void set_high_resolution(bool);
   CGRect* subRect() { return subRect_; } // getter
   void subRect(CGRect *r) { subRect_ = r; } // setter
diff --git a/FL/win32.H b/FL/win32.H
index b866f0796..0a43a2c75 100644
--- a/FL/win32.H
+++ b/FL/win32.H
@@ -66,7 +66,6 @@ public:
 		                 int &bt,int &bx,int &by);
   void make_fullscreen(int X, int Y, int W, int H);
   void setwindow(Fl_Window* wi) {w=wi; wi->i=this;}
-  void flush() {w->flush();}
   void set_minmax(LPMINMAXINFO minmax);
   void mapraise();
   int set_cursor(Fl_Cursor);
diff --git a/FL/x.H b/FL/x.H
index 2cbca6ca5..4e6ce0635 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -127,8 +127,6 @@ public:
   int set_cursor(const Fl_RGB_Image*, int, int);
   static void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap);
   static Fl_X* set_xid(Fl_Window*, Window);
-  // kludges to get around protection:
-  void flush() {w->flush();}
   static void x(Fl_Window* wi, int X) {wi->x(X);}
   static void y(Fl_Window* wi, int Y) {wi->y(Y);}
   static void activate_window(Window w);
-- 
cgit v1.2.3