From 4764b9bc2e6c6ddbdad6ea4930350a2da4fa19f2 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 20 Jul 2017 08:10:45 +0000
Subject: Fl_Window_Driver::flush_single() needs not be a virtual member
 function.

It is really an accessor to protected method Fl_Window::flush().
Rename it to Fl_Window_Driver::flush_Fl_Window to reflect that.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12340 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Window_Driver.H                                    | 2 +-
 src/Fl_Window_Driver.cxx                                 | 6 +++---
 src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx             | 2 +-
 src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.H   | 2 +-
 src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx | 2 +-
 src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H           | 2 +-
 src/drivers/X11/Fl_X11_Window_Driver.cxx                 | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H
index 9a588a46e..3035b330b 100644
--- a/FL/Fl_Window_Driver.H
+++ b/FL/Fl_Window_Driver.H
@@ -49,6 +49,7 @@ protected:
   Fl_Window *pWindow;
   struct shape_data_type;
   shape_data_type *shape_data_; ///< non-null means the window has a non-rectangular shape
+  void flush_Fl_Window(); // accessor to protected Fl_Window::flush()
 
 public:
   Fl_Window_Driver(Fl_Window *);
@@ -120,7 +121,6 @@ public:
   virtual void flush(); // the default implementation may be enough
   virtual void flush_double();
   virtual void flush_overlay();
-  virtual void flush_single();
   virtual void flush_menu();
   virtual void erase_menu() {}
   virtual void draw_begin();
diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx
index 2ec0cfaff..07fbef967 100644
--- a/src/Fl_Window_Driver.cxx
+++ b/src/Fl_Window_Driver.cxx
@@ -58,7 +58,7 @@ void Fl_Window_Driver::current(Fl_Window *c) {pWindow->current_ = c;}
 
 unsigned char Fl_Window_Driver::size_range_set() {return pWindow->size_range_set;}
 
-void Fl_Window_Driver::flush_single() { pWindow->Fl_Window::flush(); }
+void Fl_Window_Driver::flush_Fl_Window() { pWindow->Fl_Window::flush(); }
 
 void Fl_Window_Driver::flush_menu() { pWindow->Fl_Window::flush(); }
 
@@ -80,13 +80,13 @@ void Fl_Window_Driver::take_focus()
 
 void Fl_Window_Driver::flush_double()
 {
-  flush_single();
+  flush_Fl_Window();
 }
 
 
 void Fl_Window_Driver::flush_overlay()
 {
-  flush_single();
+  flush_Fl_Window();
 }
 
 
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index 91e0c263f..3385cf437 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -58,7 +58,7 @@ void Fl_Cocoa_Window_Driver::take_focus()
 
 
 void Fl_Cocoa_Window_Driver::flush_double() {
-  flush_single();
+  flush_Fl_Window();
 }
 
 
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.H b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.H
index 7c3b65d1d..47d1a584e 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.H
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.H
@@ -46,7 +46,7 @@ public:
 
   // --- window management
 //  virtual void take_focus();
-  virtual void flush_single();
+  virtual void flush();
   virtual void flush_double();
   virtual void flush_overlay();
 //  virtual void draw_begin();
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
index 6d9727dd2..4fb0dbac5 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
@@ -95,7 +95,7 @@ Fl_X *Fl_PicoAndroid_Window_Driver::makeWindow()
 }
 
 
-void Fl_PicoAndroid_Window_Driver::flush_single()
+void Fl_PicoAndroid_Window_Driver::flush()
 {
   glClearColor(0, 0, 0, 1);
   glClear(GL_COLOR_BUFFER_BIT);
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H
index 87b4b0b1d..ef765e9c3 100644
--- a/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H
@@ -46,7 +46,7 @@ public:
   virtual void draw_end();
   
   // --- window management
-//  virtual void flush_single();
+//  virtual void flush();
 };
 
 
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index ea0eaa57a..359f876de 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -648,7 +648,7 @@ void Fl_X11_Window_Driver::redraw_overlay() {
 
 void Fl_X11_Window_Driver::flush_menu() {
 #if HAVE_OVERLAY
-   if (!fl_overlay_visual || !overlay()) {flush_single(); return;}
+   if (!fl_overlay_visual || !overlay()) {flush_Fl_Window(); return;}
    Fl_X *myi = Fl_X::i(pWindow);
    fl_window = myi->xid;
 # if defined(FLTK_USE_CAIRO)
@@ -660,7 +660,7 @@ void Fl_X11_Window_Driver::flush_menu() {
    draw();
    fl_overlay = 0;
 #else
-   flush_single();
+   flush_Fl_Window();
 #endif
 }
 
-- 
cgit v1.2.3