mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Manolo Gouy 2010-06-24 21:55:20 +00:00
parent a40166931e
commit 142cefd106
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FL/Fl_Device.H
View File

@ -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);

4
src/fl_font_mac.cxx
View File

@ -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