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_font.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_font.cxx')
| -rw-r--r-- | src/fl_set_font.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx index 6d0e93da5..b41c8b6f6 100644 --- a/src/fl_set_font.cxx +++ b/src/fl_set_font.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_set_font.cxx,v 1.5.2.3.2.1 2001/11/22 15:35:01 easysw Exp $" +// "$Id: fl_set_font.cxx,v 1.5.2.3.2.2 2001/11/27 17:44:08 easysw Exp $" // // Font utilities for the Fast Light Tool Kit (FLTK). // @@ -53,7 +53,7 @@ void Fl::set_font(Fl_Font fnum, const char* name) { Fl_Fontdesc* s = fl_fonts+fnum; if (s->name) { if (!strcmp(s->name, name)) {s->name = name; return;} -#ifndef WIN32 +#if !defined(WIN32) && !defined(__APPLE__) if (s->xlist && s->n >= 0) XFreeFontNames(s->xlist); #endif for (Fl_FontSize* f = s->first; f;) { @@ -62,7 +62,7 @@ void Fl::set_font(Fl_Font fnum, const char* name) { s->first = 0; } s->name = name; -#ifndef WIN32 +#if !defined(WIN32) && !defined(__APPLE__) s->xlist = 0; #endif s->first = 0; @@ -71,5 +71,5 @@ void Fl::set_font(Fl_Font fnum, const char* name) { const char* Fl::get_font(Fl_Font fnum) {return fl_fonts[fnum].name;} // -// End of "$Id: fl_set_font.cxx,v 1.5.2.3.2.1 2001/11/22 15:35:01 easysw Exp $". +// End of "$Id: fl_set_font.cxx,v 1.5.2.3.2.2 2001/11/27 17:44:08 easysw Exp $". // |