summaryrefslogtreecommitdiff
path: root/src/fl_font_mac.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2002-06-27 23:18:12 +0000
committerMatthias Melcher <fltk@matthiasm.com>2002-06-27 23:18:12 +0000
commita4e0a9adb554a49385e3b269ba46293e8a2696f4 (patch)
tree71b86afd12e8dadf6794ba6e2aad281c820460b6 /src/fl_font_mac.cxx
parentcdc15f49a6d491b6a117a98f96e282113ee9cc97 (diff)
Added Greg Ercolanos filedescripter support
Fixed Text Width bug. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_font_mac.cxx')
-rw-r--r--src/fl_font_mac.cxx11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx
index 87a397d81..0e9b80341 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.9 2002/06/27 04:29:39 matthiaswm Exp $"
+// "$Id: fl_font_mac.cxx,v 1.1.2.10 2002/06/27 23:18:12 matthiaswm Exp $"
//
// MacOS font selection routines for the Fast Light Tool Kit (FLTK).
//
@@ -27,6 +27,7 @@
//: TextSize, TextFont
//: GetFNum (theName: Str255; VAR familyID: Integer);
//: FUNCTION FMSwapFont (inRec: FMInput): FMOutPtr;
+//: SetFractEnable
Fl_FontSize::Fl_FontSize(const char* name, int Size) {
knowMetrics = 0;
@@ -126,13 +127,7 @@ static Fl_FontSize* find(int fnum, int size) {
////////////////////////////////////////////////////////////////
// Public interface:
-int fl_font_ = 0;
-int fl_size_ = 0;
-
void fl_font(int fnum, int size) {
- if (fnum == fl_font_ && size == fl_size_) return;
- fl_font_ = fnum;
- fl_size_ = size;
fl_font(find(fnum, size));
}
@@ -159,5 +154,5 @@ void fl_draw(const char* str, int n, int x, int y) {
}
//
-// End of "$Id: fl_font_mac.cxx,v 1.1.2.9 2002/06/27 04:29:39 matthiaswm Exp $".
+// End of "$Id: fl_font_mac.cxx,v 1.1.2.10 2002/06/27 23:18:12 matthiaswm Exp $".
//