From 74dbd5e017b6ffd2aaf34c5958c053132bbceade Mon Sep 17 00:00:00 2001 From: Ian MacArthur Date: Thu, 8 Apr 2010 17:51:28 +0000 Subject: The non-XFT X11 builds fail because they are not updated to use the Fl_Device patches. This is an attempt to remedy that. Can someone familiar with the Fl_Device stuff please verify these changes? With these changes in place the code now builds and seems to work. I have NOT tested print support however - should that matter? git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7472 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_font_x.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx index a9b945b96..6c0d1e646 100644 --- a/src/fl_font_x.cxx +++ b/src/fl_font_x.cxx @@ -261,7 +261,7 @@ XUtf8FontStruct* fl_xfont; void *fl_xftfont = 0; static GC font_gc; -void fl_font(Fl_Font fnum, Fl_Fontsize size) { +void Fl_Device::font(Fl_Font fnum, Fl_Fontsize size) { if (fnum==-1) { fl_font_ = 0; fl_size_ = 0; return; @@ -310,7 +310,7 @@ void fl_text_extents(const char *c, int n, int &dx, int &dy, int &W, int &H) { } // fl_text_extents -void fl_draw(const char* c, int n, int x, int y) { +void Fl_Device::draw(const char* c, int n, int x, int y) { if (font_gc != fl_gc) { if (!fl_xfont) fl_font(FL_HELVETICA, 14); font_gc = fl_gc; @@ -319,7 +319,7 @@ void fl_draw(const char* c, int n, int x, int y) { // XDrawString(fl_display, fl_window, fl_gc, x, y, c, n); XUtf8DrawString(fl_display, fl_window, fl_xfont, fl_gc, x, y, c, n); } -void fl_draw(int angle, const char *str, int n, int x, int y) { +void Fl_Device::draw(int angle, const char *str, int n, int x, int y) { fprintf(stderr,"ROTATING TEXT NOT IMPLIMENTED\n"); fl_draw(str, n, (int)x, (int)y); } -- cgit v1.2.3