diff options
| author | Manolo Gouy <Manolo> | 2017-05-22 13:59:22 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2017-05-22 13:59:22 +0000 |
| commit | 0489d790850d20b180bc7f5a5aebce8a03a5c1d2 (patch) | |
| tree | 01a8cd8e4f2377556f05ab82b3b1fbe65eb97192 /src/drivers/GDI | |
| parent | 58c21c0bc6c5112c4c46208ba2264b3ad246c37c (diff) | |
Fix warnings: 'Fl_Xlib_Graphics_Driver::scale' hides overloaded virtual function [-Woverloaded-virtual]
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12242 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/GDI')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.H | 1 | ||||
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H index 140e6acea..a641e4c89 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H @@ -91,6 +91,7 @@ public: void untranslate_all(void); static HRGN scale_region(HRGN r, float f, bool keep, bool inflate=false); virtual void scale(float f); + virtual float scale(); protected: void transformed_vertex0(float x, float y); void fixloop(); diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index e211f1e3a..00bade1b1 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -236,6 +236,10 @@ void Fl_GDI_Graphics_Driver::scale(float f) { } } +float Fl_GDI_Graphics_Driver::scale() { + return scale_; +} + /* Rescale region r with factor f and returns the scaled region. The input region is deleted if keep is false. |