diff options
| author | Manolo Gouy <Manolo> | 2016-12-01 06:40:17 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-12-01 06:40:17 +0000 |
| commit | 7f3f3f3e08f5e1692449c2f82b9e3802f96bb68b (patch) | |
| tree | 2135895d7a8538da6683a2db2d66506f5fd27e71 | |
| parent | 1458f7e84bdd697bb3279c4cf00a6182d4322c33 (diff) | |
Rename Fl_Surface_Device::_surface private member variable to surface_ following the CMP.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12130 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Device.H | 4 | ||||
| -rw-r--r-- | src/Fl_Device.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 41e3a9fe7..7228d3cd7 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -54,7 +54,7 @@ class Fl_Widget; class FL_EXPORT Fl_Surface_Device { /** 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 *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. @@ -72,7 +72,7 @@ public: /** The current drawing surface. In other words, the Fl_Surface_Device object that currently receives all graphics output */ static inline Fl_Surface_Device *surface() { - return _surface ? _surface : default_surface(); + return surface_ ? surface_ : default_surface(); }; /** \brief The destructor. */ virtual ~Fl_Surface_Device(); diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx index 9f0b6292c..2726eaca8 100644 --- a/src/Fl_Device.cxx +++ b/src/Fl_Device.cxx @@ -56,12 +56,12 @@ void Fl_Surface_Device::set_current(void) { if (pre_surface_) pre_surface_->end_current_(); fl_graphics_driver = pGraphicsDriver; - _surface = this; + surface_ = this; pGraphicsDriver->global_gc(); 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() |