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 --- FL/Fl_Device.H | 3 +++ FL/fl_draw.H | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'FL') diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 21251f6c6..b1eaea341 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -129,6 +129,7 @@ protected: 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); 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); friend void fl_color(Fl_Color c); friend void fl_color(uchar r, uchar g, uchar b); @@ -193,6 +194,8 @@ protected: virtual void draw(const char *str, int n, int x, int y); /** \brief see fl_draw(int angle, const char *str, int n, int x, int y). */ virtual void draw(int angle, const char *str, int n, int x, int y); + /** \brief see fl_rtl_draw(const char *str, int n, int x, int y). */ + virtual void rtl_draw(const char *str, int n, int x, int y); /** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */ virtual void font(Fl_Font face, Fl_Fontsize size); /** \brief see fl_color(Fl_Color c). */ diff --git a/FL/fl_draw.H b/FL/fl_draw.H index f416d7363..4ce91f03f 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -563,7 +563,7 @@ inline void fl_draw(int angle,const char* str, int n, int x, int y) {fl_device-> /** Draws an array of \p n characters right to left starting at given location. */ -FL_EXPORT void fl_rtl_draw(const char*, int n, int x, int y); +inline void fl_rtl_draw(const char* str, int n, int x, int y) {fl_device->rtl_draw(str,n,x,y); }; FL_EXPORT void fl_measure(const char* str, int& x, int& y, int draw_symbols = 1); FL_EXPORT void fl_draw(const char* str, int x, int y, int w, int h, -- cgit v1.2.3