diff options
| author | Manolo Gouy <Manolo> | 2017-09-09 12:35:06 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2017-09-09 12:35:06 +0000 |
| commit | 8e558595e653543dcc39ed079aaa9f8d87479fdc (patch) | |
| tree | 9e407cbd130107e40b4a68f61e6e94cea336f7c3 /FL/Fl_Image.H | |
| parent | ae983b74f271c2466804b1a9ab071a4fc8b1b4d0 (diff) | |
Make virtual member function Fl_Image::draw_scaled(int X, int Y, int W, int H) protected rather than private.
Consequently, remove the trailing _ from its name reserved for private class members.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12433 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Image.H')
| -rw-r--r-- | FL/Fl_Image.H | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index ae626772c..f338500cd 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -69,7 +69,6 @@ private: // Forbid use of copy constructor and assign operator Fl_Image & operator=(const Fl_Image &); Fl_Image(const Fl_Image &); - virtual int draw_scaled_(int X, int Y, int W, int H); protected: @@ -105,6 +104,7 @@ protected: static void labeltype(const Fl_Label *lo, int lx, int ly, int lw, int lh, Fl_Align la); static void measure(const Fl_Label *lo, int &lw, int &lh); + virtual int draw_scaled(int X, int Y, int W, int H); public: @@ -225,7 +225,9 @@ private: fl_uintptr_t id_; fl_uintptr_t mask_; float cache_scale_; // graphics scaling value when id_ was computed - virtual int draw_scaled_(int X, int Y, int W, int H); + +protected: + virtual int draw_scaled(int X, int Y, int W, int H); public: |