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_win32.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_win32.cxx')
| -rw-r--r-- | src/fl_font_win32.cxx | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/fl_font_win32.cxx b/src/fl_font_win32.cxx index 6c5799776..11decaf94 100644 --- a/src/fl_font_win32.cxx +++ b/src/fl_font_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_font_win32.cxx,v 1.9.2.3.2.2 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_font_win32.cxx,v 1.9.2.3.2.3 2002/03/06 18:11:01 easysw Exp $" // // WIN32 font selection routines for the Fast Light Tool Kit (FLTK). // @@ -23,16 +23,6 @@ // Please report all bugs and problems to "fltk-bugs@fltk.org". // -#include <config.h> -#include <FL/Fl.H> -#include <FL/fl_draw.H> -#include <FL/win32.H> -#include "Fl_Font.H" - -#include <ctype.h> -#include <stdlib.h> -#include <string.h> - Fl_FontSize::Fl_FontSize(const char* name, int size) { int weight = FW_NORMAL; int italic = 0; @@ -147,12 +137,6 @@ int fl_descent() { return fl_fontsize->metr.tmDescent; } -double fl_width(const char* c) { - double w = 0.0; - while (*c) w += fl_fontsize->width[uchar(*c++)]; - return w; -} - double fl_width(const char* c, int n) { double w = 0.0; while (n--) w += fl_fontsize->width[uchar(*c++)]; @@ -170,10 +154,7 @@ void fl_draw(const char* str, int n, int x, int y) { SetTextColor(fl_gc, oldColor); } -void fl_draw(const char* str, int x, int y) { - fl_draw(str, strlen(str), x, y); -} // -// End of "$Id: fl_font_win32.cxx,v 1.9.2.3.2.2 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_font_win32.cxx,v 1.9.2.3.2.3 2002/03/06 18:11:01 easysw Exp $". // |