From 449b99dd86c7bdc08f98dd603ee6d18ff1a025dd Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Mon, 21 Jun 2010 15:49:45 +0000 Subject: Fix STR 2339 by defining new member function rtl_draw of class Fl_Graphics_Driver git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7652 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_font_mac.cxx | 4 ++-- src/fl_font_win32.cxx | 2 +- src/fl_font_x.cxx | 2 +- src/fl_font_xft.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index cb6887827..1a67bf558 100644 --- a/src/fl_font_mac.cxx +++ b/src/fl_font_mac.cxx @@ -488,8 +488,8 @@ void Fl_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { CGContextRestoreGState(fl_gc); } -void fl_rtl_draw(const char* c, int n, int x, int y) { - fl_draw(c, n, x - fl_width(c, n), y); //to check; +void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { + draw(c, n, x - fl_width(c, n), y); } // diff --git a/src/fl_font_win32.cxx b/src/fl_font_win32.cxx index 7220eb3b9..b6079444a 100644 --- a/src/fl_font_win32.cxx +++ b/src/fl_font_win32.cxx @@ -386,7 +386,7 @@ void Fl_Graphics_Driver::draw(int angle, const char* str, int n, int x, int y) { fl_font(fl_font_, fl_size_); } -void fl_rtl_draw(const char* c, int n, int x, int y) { +void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { int wn; int i = 0; int lx = 0; diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx index e6ccea79c..2f56e39ef 100644 --- a/src/fl_font_x.cxx +++ b/src/fl_font_x.cxx @@ -335,7 +335,7 @@ void Fl_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { // fl_draw(str, n, (int)x, (int)y); //} -void fl_rtl_draw(const char* c, int n, int x, int y) { +void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { if (font_gc != fl_gc) { if (!current_font) fl_font(FL_HELVETICA, 12); font_gc = fl_gc; diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx index bf2ca3ee8..c249bc52a 100644 --- a/src/fl_font_xft.cxx +++ b/src/fl_font_xft.cxx @@ -584,7 +584,7 @@ static void fl_drawUCS4(const FcChar32 *str, int n, int x, int y) { } -void fl_rtl_draw(const char* c, int n, int x, int y) { +void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { #if defined(__GNUC__) #warning Need to improve this XFT right to left draw function -- cgit v1.2.3