Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-29 04:26:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename Fl_Surface_Device::_surface private member variable to surface_ following the CMP.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12130 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2016-12-01 06:40:17 +00:00
parent 1458f7e84b
commit 7f3f3f3e08
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Device.H
+2 -2
View File
@@ -54,7 +54,7 @@ class Fl_Widget;
class FL_EXPORT Fl_Surface_Device { class FL_EXPORT Fl_Surface_Device {
/** The graphics driver in use by this surface. */ /** The graphics driver in use by this surface. */
Fl_Graphics_Driver *pGraphicsDriver; Fl_Graphics_Driver *pGraphicsDriver;
static Fl_Surface_Device *_surface; // the surface that currently receives graphics output 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 *default_surface(); // create surface if none exists yet
static Fl_Surface_Device *pre_surface_; static Fl_Surface_Device *pre_surface_;
// Some drawing surfaces (e.g., Fl_XXX_Image_Surface_Driver) need to re-implement this. // Some drawing surfaces (e.g., Fl_XXX_Image_Surface_Driver) need to re-implement this.
@@ -72,7 +72,7 @@ public:
/** The current drawing surface. /** The current drawing surface.
In other words, the Fl_Surface_Device object that currently receives all graphics output */ In other words, the Fl_Surface_Device object that currently receives all graphics output */
static inline Fl_Surface_Device *surface() { static inline Fl_Surface_Device *surface() {
return _surface ? _surface : default_surface(); return surface_ ? surface_ : default_surface();
}; };
/** \brief The destructor. */ /** \brief The destructor. */
virtual ~Fl_Surface_Device(); virtual ~Fl_Surface_Device();
src/Fl_Device.cxx
+2 -2
View File
@@ -56,12 +56,12 @@ void Fl_Surface_Device::set_current(void)
{ {
if (pre_surface_) pre_surface_->end_current_(); if (pre_surface_) pre_surface_->end_current_();
fl_graphics_driver = pGraphicsDriver; fl_graphics_driver = pGraphicsDriver;
_surface = this; surface_ = this;
pGraphicsDriver->global_gc(); pGraphicsDriver->global_gc();
pre_surface_ = this; pre_surface_ = this;
} }
Fl_Surface_Device* Fl_Surface_Device::_surface; // the current target surface of graphics operations Fl_Surface_Device* Fl_Surface_Device::surface_; // the current target surface of graphics operations
Fl_Surface_Device::~Fl_Surface_Device() Fl_Surface_Device::~Fl_Surface_Device()