mirror of
https://github.com/fltk/fltk.git
synced 2026-06-04 15:32:12 +08:00
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
This commit is contained in:
@@ -91,6 +91,7 @@ public:
|
|||||||
void untranslate_all(void);
|
void untranslate_all(void);
|
||||||
static HRGN scale_region(HRGN r, float f, bool keep, bool inflate=false);
|
static HRGN scale_region(HRGN r, float f, bool keep, bool inflate=false);
|
||||||
virtual void scale(float f);
|
virtual void scale(float f);
|
||||||
|
virtual float scale();
|
||||||
protected:
|
protected:
|
||||||
void transformed_vertex0(float x, float y);
|
void transformed_vertex0(float x, float y);
|
||||||
void fixloop();
|
void fixloop();
|
||||||
|
|||||||
@@ -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.
|
/* Rescale region r with factor f and returns the scaled region.
|
||||||
The input region is deleted if keep is false.
|
The input region is deleted if keep is false.
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ public:
|
|||||||
void translate_all(int dx, int dy);
|
void translate_all(int dx, int dy);
|
||||||
void untranslate_all();
|
void untranslate_all();
|
||||||
virtual void scale(float f);
|
virtual void scale(float f);
|
||||||
|
virtual float scale();
|
||||||
virtual int has_feature(driver_feature mask) { return mask & NATIVE; }
|
virtual int has_feature(driver_feature mask) { return mask & NATIVE; }
|
||||||
virtual void *gc() { return gc_; }
|
virtual void *gc() { return gc_; }
|
||||||
virtual void gc(void *value);
|
virtual void gc(void *value);
|
||||||
|
|||||||
@@ -101,6 +101,11 @@ void Fl_Xlib_Graphics_Driver::scale(float f) {
|
|||||||
#endif
|
#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) {
|
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_);
|
XCopyArea(fl_display, pixmap, fl_window, gc_, srcx, srcy, w, h, x+offset_x_*scale_, y+offset_y_*scale_);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user