summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-02-04 16:46:41 +0000
committerManolo Gouy <Manolo>2011-02-04 16:46:41 +0000
commit31bbbf7ae60f07d5f87454db0be9e27eea676ded (patch)
tree7b891b93c7e4907cb7a2a30c6273cbef27187f28 /FL
parent7c932c25d6a74530e5b086d8b0d888546cad10cc (diff)
Removed the requirement of declaring class Fl_PostScript_Graphics_Driver friend of
class Fl_Graphics_Driver. This is undesirable because it obliges a user (e.g., Mingodad and his PDF driver) who develops a new graphics driver to change the FLTK source code. Just declaring font() public instead of private is enough. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8367 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Device.H5
1 files changed, 2 insertions, 3 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index e47343e28..bc757ee2e 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -98,7 +98,6 @@ protected:
friend class Fl_Pixmap;
friend class Fl_Bitmap;
friend class Fl_RGB_Image;
- friend class Fl_PostScript_Graphics_Driver;
friend void fl_rect(int x, int y, int w, int h);
friend void fl_rectf(int x, int y, int w, int h);
friend void fl_line_style(int style, int width, char* dashes);
@@ -179,8 +178,6 @@ protected:
virtual void draw(int angle, const char *str, int n, int x, int y) = 0;
/** \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) = 0;
- /** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */
- virtual void font(Fl_Font face, Fl_Fontsize size) = 0;
/** \brief see fl_color(Fl_Color c). */
virtual void color(Fl_Color c) = 0;
/** \brief see fl_color(uchar r, uchar g, uchar b). */
@@ -272,6 +269,8 @@ protected:
public:
static const char *class_id;
+ /** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */
+ virtual void font(Fl_Font face, Fl_Fontsize size) = 0;
/** \brief The destructor */
virtual ~Fl_Graphics_Driver() {};
};