summaryrefslogtreecommitdiff
path: root/src/fl_font_mac.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2004-08-26 06:18:12 +0000
committerMatthias Melcher <fltk@matthiasm.com>2004-08-26 06:18:12 +0000
commit329f84671efd278d548900d977f307057174e9c8 (patch)
treee78f6dc48346615b1d4e1f16b22c64d5bfceea81 /src/fl_font_mac.cxx
parent25fe8425db613e4eaeff7898e803dd0f68fe57a5 (diff)
Mac Quartz:
- attempt at making the clipping work well - improved drawing (still many 1-off bugs) - 'arc' test seems to run well - beware! the Quartz version is pretty unstable at this point git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3785 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_font_mac.cxx')
-rw-r--r--src/fl_font_mac.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx
index d4fb360a7..ce5e3ba34 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.17 2004/08/26 00:18:43 matthiaswm Exp $"
+// "$Id: fl_font_mac.cxx,v 1.1.2.18 2004/08/26 06:18:12 matthiaswm Exp $"
//
// MacOS font selection routines for the Fast Light Tool Kit (FLTK).
//
@@ -130,6 +130,7 @@ void fl_font(Fl_FontSize* s) {
fl_fontsize->knowMetrics = 1;
}
#elif defined(__APPLE_QUARTZ__)
+ if (!s) return;
CGContextSelectFont(fl_gc, s->q_name, (float)s->size, kCGEncodingMacRoman);
#else
# error : need to defined either Quartz or Quickdraw
@@ -224,5 +225,5 @@ void fl_draw(const char* str, int n, int x, int y) {
//
-// End of "$Id: fl_font_mac.cxx,v 1.1.2.17 2004/08/26 00:18:43 matthiaswm Exp $".
+// End of "$Id: fl_font_mac.cxx,v 1.1.2.18 2004/08/26 06:18:12 matthiaswm Exp $".
//