diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-04-06 12:54:57 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-04-06 12:54:57 +0000 |
| commit | 67af078c9c470dfc1bac3d5105a0b5cc4f1c63e5 (patch) | |
| tree | 1745eb87a41b994f31ac6c024b562bb36e390161 | |
| parent | 7903799bf2ece8f5fdb760c507c1e64ce8418b97 (diff) | |
Fix fl_font/fl_size on MacOS X.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2968 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CREDITS | 6 | ||||
| -rw-r--r-- | src/fl_font_mac.cxx | 9 |
3 files changed, 14 insertions, 7 deletions
@@ -1,9 +1,11 @@ CHANGES IN FLTK 1.1.4 + - fl_font() and fl_size() were not implemented on MacOS + X. - Sorted the icon menu bar in fluid. - Fixed minor memory access complaints from Valgrind - - Compiling src/flstring.h on OS X with BSD header - would fail. + - Compiling src/flstring.h on OS X with BSD header would + fail. - Fl_Text_Editor didn't scroll the buffer when the user pressed Ctrl+End or Ctrl+Home. - Fl_Text_Editor didn't show its cursor when the mouse @@ -1,5 +1,5 @@ -CREDITS - Fast Light Tool Kit (FLTK) Version 1.1.0 -------------------------------------------------- +CREDITS - Fast Light Tool Kit (FLTK) Version 1.1.4 +-------------------------------------------------- This file lists the people responsible for the toolkit you are now using. If you've looking for your name in lights @@ -12,7 +12,7 @@ CORE DEVELOPERS The following people do the day-to-day development of FLTK: Craig P. Earls - Curtis Edwards (trilex@users.sourceforge.net) + Curtis Edwards (trilec@users.sourceforge.net) Gustavo Hime (hime@users.sourceforge.net) Talbot Hughes Robert Kesterson (robertk@users.sourceforge.net) diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index 619488f03..285981e8e 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.11 2003/01/30 21:43:48 easysw Exp $" +// "$Id: fl_font_mac.cxx,v 1.1.2.12 2003/04/06 12:54:57 easysw Exp $" // // MacOS font selection routines for the Fast Light Tool Kit (FLTK). // @@ -127,7 +127,12 @@ 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) { + fl_font_ = fnum; + fl_size_ = size; fl_font(find(fnum, size)); } @@ -154,5 +159,5 @@ void fl_draw(const char* str, int n, int x, int y) { } // -// End of "$Id: fl_font_mac.cxx,v 1.1.2.11 2003/01/30 21:43:48 easysw Exp $". +// End of "$Id: fl_font_mac.cxx,v 1.1.2.12 2003/04/06 12:54:57 easysw Exp $". // |