diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2021-03-01 11:20:03 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2021-03-01 11:20:15 +0100 |
| commit | 81a4b7329c631ce337d8dee8b98ab602aa5f8525 (patch) | |
| tree | 6037db4b38926d77bab6c8c756313ffca8c28b94 /src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx | |
| parent | 49a78bc482bc112248a05f0b1ea78bcf80403efa (diff) | |
Remove warnings about hidden virtual member functions.
Diffstat (limited to 'src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx')
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx index fc6bc48c1..c6a266b96 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx @@ -172,11 +172,22 @@ FL_EXPORT int glutStrokeWidth(void *font, int character); // use gl_font()/gl_draw() to draw GL text void Fl_OpenGL_Graphics_Driver::font(Fl_Font face, Fl_Fontsize fsize) { + Fl_Graphics_Driver::font(face, fsize); Fl_Surface_Device::push_current(Fl_Display_Device::display_device()); gl_font(face, fsize); Fl_Surface_Device::pop_current(); } +Fl_Font Fl_OpenGL_Graphics_Driver::font() { + return Fl_Graphics_Driver::font(); +} + +void Fl_OpenGL_Graphics_Driver::draw(const char *str, int n, float x, float y) { + this->draw(str, n, int(x), int(y)); +} + +void Fl_OpenGL_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) {} + void Fl_OpenGL_Graphics_Driver::draw(const char* str, int n, int x, int y) { Fl_Surface_Device::push_current(Fl_Display_Device::display_device()); gl_draw(str, n, x, y); @@ -190,6 +201,8 @@ double Fl_OpenGL_Graphics_Driver::width(const char *str, int n) { return w; } +double Fl_OpenGL_Graphics_Driver::width(unsigned int c) { return Fl_Graphics_Driver::width(c); } + int Fl_OpenGL_Graphics_Driver::descent() { Fl_Surface_Device::push_current(Fl_Display_Device::display_device()); int d = fl_descent(); |
