diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-27 17:44:08 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-27 17:44:08 +0000 |
| commit | 2b85bf81680e2243ef5a5daf85d9eb04321c7278 (patch) | |
| tree | dc7d3e1cdbd44ed10b358412098b73d24b64d143 /src/fl_set_fonts.cxx | |
| parent | 4dc5732a3e0f376786d1d6b788e5cf601439e890 (diff) | |
Preliminary commit of my MacOS X work.
**** THIS CODE COMPILES BUT DOES NOT WORK. ****
TODO: fix event handling - getting blank windows, etc.
TODO: re-port OpenGL code.
TODO: add support for images with alpha.
TODO: add support for more then just beeps in fl_beep().
TODO: other stuff I'm sure...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_set_fonts.cxx')
| -rw-r--r-- | src/fl_set_fonts.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/fl_set_fonts.cxx b/src/fl_set_fonts.cxx index a5c30dcfd..6c8dee8a9 100644 --- a/src/fl_set_fonts.cxx +++ b/src/fl_set_fonts.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.1 2001/11/26 20:13:29 easysw Exp $" +// "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.2 2001/11/27 17:44:08 easysw Exp $" // // More font utilities for the Fast Light Tool Kit (FLTK). // @@ -29,7 +29,9 @@ // and bold italic. #ifdef WIN32 -#include "fl_set_fonts_win32.cxx" +# include "fl_set_fonts_win32.cxx" +#elif defined(__APPLE__) +# include "fl_set_fonts_mac.cxx" #else // Standard X fonts are matched by a pattern that is always of @@ -55,12 +57,12 @@ // and can identify any font on X that way. You may want to write your // own system of font management and not use this code. -#include <FL/Fl.H> -#include <FL/x.H> -#include "Fl_Font.H" -#include <ctype.h> -#include <string.h> -#include <stdlib.h> +# include <FL/Fl.H> +# include <FL/x.H> +# include "Fl_Font.H" +# include <ctype.h> +# include <string.h> +# include <stdlib.h> // turn word N of a X font name into either some attribute bits // (right now 0, FL_BOLD, or FL_ITALIC), or into -1 indicating that @@ -335,5 +337,5 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { #endif // -// End of "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.1 2001/11/26 20:13:29 easysw Exp $". +// End of "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.2 2001/11/27 17:44:08 easysw Exp $". // |