From cdcf5839899276b041b56b70798055f0d438bbdb Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Wed, 9 May 2018 23:28:04 +1000 Subject: Text_Editor key bindings hopefully fixed, yet more polishing --- src/c_fl_graphics_driver.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/c_fl_graphics_driver.cpp') diff --git a/src/c_fl_graphics_driver.cpp b/src/c_fl_graphics_driver.cpp index 187ece9..73112b4 100644 --- a/src/c_fl_graphics_driver.cpp +++ b/src/c_fl_graphics_driver.cpp @@ -15,19 +15,23 @@ unsigned int fl_graphics_driver_color(GRAPHICS_DRIVER g) { int fl_graphics_driver_descent(GRAPHICS_DRIVER g) { - return reinterpret_cast(g)->descent(); + // virtual so disable dispatch + return reinterpret_cast(g)->Fl_Graphics_Driver::descent(); } int fl_graphics_driver_height(GRAPHICS_DRIVER g) { - return reinterpret_cast(g)->height(); + // virtual so disable dispatch + return reinterpret_cast(g)->Fl_Graphics_Driver::height(); } double fl_graphics_driver_width(GRAPHICS_DRIVER g, unsigned int c) { - return reinterpret_cast(g)->width(c); + // virtual so disable dispatch + return reinterpret_cast(g)->Fl_Graphics_Driver::width(c); } double fl_graphics_driver_width2(GRAPHICS_DRIVER g, const char * s, int l) { - return reinterpret_cast(g)->width(s,l); + // virtual so disable dispatch + return reinterpret_cast(g)->Fl_Graphics_Driver::width(s,l); } int fl_graphics_driver_get_font(GRAPHICS_DRIVER g) { @@ -39,14 +43,16 @@ int fl_graphics_driver_size(GRAPHICS_DRIVER g) { } void fl_graphics_driver_set_font(GRAPHICS_DRIVER g, int f, int s) { - reinterpret_cast(g)->font(f,s); + // virtual so disable dispatch + reinterpret_cast(g)->Fl_Graphics_Driver::font(f,s); } void fl_graphics_driver_draw_scaled(GRAPHICS_DRIVER g, void * i, int x, int y, int w, int h) { - reinterpret_cast(g)->draw_scaled(reinterpret_cast(i),x,y,w,h); + // virtual so disable dispatch + reinterpret_cast(g)->Fl_Graphics_Driver::draw_scaled(reinterpret_cast(i),x,y,w,h); } -- cgit