diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-02 15:51:38 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-02 15:51:38 +0000 |
| commit | beb210d4d4ea2550fcc9de5a610b8fe6d9afc631 (patch) | |
| tree | f792a964cfdc82e9de4fd838be0c58282eefbbd5 /FL | |
| parent | c061230dc7ba0d14dcfa96dedb59f34f6a16d378 (diff) | |
Font changes from Bill.
git-svn-id: file:///fltk/svn/fltk/trunk@109 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/fl_draw.H | 8 | ||||
| -rw-r--r-- | FL/x.H | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/FL/fl_draw.H b/FL/fl_draw.H index e0531dbe5..c4b1fb7b4 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -1,5 +1,5 @@ // -// "$Id: fl_draw.H,v 1.4 1998/12/02 15:39:28 mike Exp $" +// "$Id: fl_draw.H,v 1.5 1998/12/02 15:51:33 mike Exp $" // // Portable drawing function header file for the Fast Light Tool Kit (FLTK). // @@ -121,8 +121,10 @@ double fl_width(uchar); // draw using current font: void fl_draw(const char*, int x, int y); void fl_draw(const char*, int n, int x, int y); -void fl_draw(const char*, int x, int y, int w, int h, Fl_Align); void fl_measure(const char*, int& x, int& y); +void fl_draw(const char*, int,int,int,int, Fl_Align); +void fl_draw(const char*, int,int,int,int, Fl_Align, + void (*callthis)(const char *, int n, int x, int y)); // boxtypes: void fl_frame(const char* s, int x, int y, int w, int h); @@ -156,5 +158,5 @@ int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scalable); #endif // -// End of "$Id: fl_draw.H,v 1.4 1998/12/02 15:39:28 mike Exp $". +// End of "$Id: fl_draw.H,v 1.5 1998/12/02 15:51:33 mike Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: x.H,v 1.6 1998/11/05 16:04:41 mike Exp $" +// "$Id: x.H,v 1.7 1998/12/02 15:51:34 mike Exp $" // // X11 header file for the Fast Light Tool Kit (FLTK). // @@ -56,6 +56,7 @@ extern Colormap fl_colormap; // drawing functions: extern GC fl_gc; extern Window fl_window; +extern XFontStruct* fl_xfont; ulong fl_xpixel(Fl_Color i); ulong fl_xpixel(uchar r, uchar g, uchar b); void fl_clip_region(Region); @@ -116,5 +117,5 @@ extern int fl_background_pixel; // hack into Fl_X::make_xid() #endif // -// End of "$Id: x.H,v 1.6 1998/11/05 16:04:41 mike Exp $". +// End of "$Id: x.H,v 1.7 1998/12/02 15:51:34 mike Exp $". // |