diff options
| author | Manolo Gouy <Manolo> | 2017-07-20 08:10:45 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2017-07-20 08:10:45 +0000 |
| commit | 4764b9bc2e6c6ddbdad6ea4930350a2da4fa19f2 (patch) | |
| tree | 6ccf866ee5d23446c43808ffa91afd7c4520481d /src/drivers | |
| parent | 864c7609c769570e99c6417278892542accea6f7 (diff) | |
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
Diffstat (limited to 'src/drivers')
5 files changed, 6 insertions, 6 deletions
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 } |