diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-06 18:11:01 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-06 18:11:01 +0000 |
| commit | e52b682a995fe2d7662b3f10730420996ccbb146 (patch) | |
| tree | d7bbbd4de9e9728191bb2407e763437366806b00 /src/fl_font_mac.cxx | |
| parent | 394286265a96aa27fbedc0cd58c5bb33366123b3 (diff) | |
Add Xft support to 1.1.x.
TODO: Fl::set_fonts() should add all of the fonts returned by Xft;
right now it is a no-op.
BUG: Getting X messages like "XRequest.155: 202 0x260002b" for some
reason on my system.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1987 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_font_mac.cxx')
| -rw-r--r-- | src/fl_font_mac.cxx | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index c8e4c5442..80808e8b0 100644 --- a/src/fl_font_mac.cxx +++ b/src/fl_font_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_font_mac.cxx,v 1.1.2.4 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_font_mac.cxx,v 1.1.2.5 2002/03/06 18:11:01 easysw Exp $" // // MacOS font selection routines for the Fast Light Tool Kit (FLTK). // @@ -28,17 +28,6 @@ //: GetFNum (theName: Str255; VAR familyID: Integer); //: FUNCTION FMSwapFont (inRec: FMInput): FMOutPtr; - -#include <config.h> -#include <FL/Fl.H> -#include <FL/fl_draw.H> -#include <FL/mac.H> -#include "Fl_Font.h" - -#include <ctype.h> -#include <stdlib.h> -#include <string.h> - Fl_FontSize::Fl_FontSize(const char* name, int Size) { knowMetrics = 0; switch (*name++) { @@ -149,11 +138,6 @@ int fl_descent() { return fl_fontsize->descent; } -double fl_width(const char* c) { - int n = strlen( c ); - return (double)TextWidth( c, 0, n ); -} - double fl_width(const char* c, int n) { return (double)TextWidth( c, 0, n ); } @@ -167,10 +151,6 @@ void fl_draw(const char* str, int n, int x, int y) { DrawText(str, 0, n); } -void fl_draw(const char* str, int x, int y) { - fl_draw(str, strlen(str), x, y); -} - // -// End of "$Id: fl_font_mac.cxx,v 1.1.2.4 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_font_mac.cxx,v 1.1.2.5 2002/03/06 18:11:01 easysw Exp $". // |