From 142cefd10627f0dcc9aa68fa9f1cc74728851b61 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 24 Jun 2010 21:55:20 +0000 Subject: Mac OS X: fixed bug where fl_draw(const char*, int, float, float) would not work on non-Quartz device git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7654 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Device.H | 3 +++ src/fl_font_mac.cxx | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index b1eaea341..6b52ae674 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -128,6 +128,9 @@ protected: friend void fl_line(int x, int y, int x1, int y1); friend void fl_line(int x, int y, int x1, int y1, int x2, int y2); friend void fl_draw(const char *str, int n, int x, int y); +#ifdef __APPLE__ + friend void fl_draw(const char *str, int n, float x, float y); +#endif friend void fl_draw(int angle, const char *str, int n, int x, int y); friend void fl_rtl_draw(const char *str, int n, int x, int y); friend void fl_font(Fl_Font face, Fl_Fontsize size); diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index 1a67bf558..d7ac2dfcb 100644 --- a/src/fl_font_mac.cxx +++ b/src/fl_font_mac.cxx @@ -425,6 +425,10 @@ static CGColorRef flcolortocgcolor(Fl_Color i) void fl_draw(const char *str, int n, float x, float y) { + if(fl_device->type() != Fl_Quartz_Graphics_Driver::device_type) { + fl_device->draw(str, n, (int)x, (int)y ); + return; + } // avoid a crash if no font has been selected by user yet ! check_default_font(); // convert to UTF-16 first -- cgit v1.2.3