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

4 files changed, 11 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.
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
index d1f6f3fc9..2bc5aac50 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
@@ -105,6 +105,7 @@ public:
   void translate_all(int dx, int dy);
   void untranslate_all();
   virtual void scale(float f);
+  virtual float scale();
   virtual int has_feature(driver_feature mask) { return mask & NATIVE; }
   virtual void *gc() { return gc_; }
   virtual void gc(void *value);
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
index 741ceb89a..b446a1fd8 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
@@ -101,6 +101,11 @@ void Fl_Xlib_Graphics_Driver::scale(float f) {
 #endif
 }
 
+
+float Fl_Xlib_Graphics_Driver::scale() {
+  return scale_;
+}
+
 void Fl_Xlib_Graphics_Driver::copy_offscreen_unscaled(float x, float y, float w, float h, Fl_Offscreen pixmap, float srcx, float srcy) {
   XCopyArea(fl_display, pixmap, fl_window, gc_, srcx, srcy, w, h, x+offset_x_*scale_, y+offset_y_*scale_);
 }