summaryrefslogtreecommitdiff
path: root/src/Fl_Font.H
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2004-08-26 00:18:43 +0000
committerMatthias Melcher <fltk@matthiasm.com>2004-08-26 00:18:43 +0000
commit25fe8425db613e4eaeff7898e803dd0f68fe57a5 (patch)
treedcf668b3037121a193e825b5ffa4d6721b733dfe /src/Fl_Font.H
parent8327822026ac50dc9e20823988b0f53bc143b7ba (diff)
Quartz implementation for FLTK 1.1:
- added very crude font support - added line drawing support - added line color support - added filled shapes support - added some arc and circle support (no ovals) - attempt at getting the clipping working, however the stack oriented design of Quartz is starting to become a real hassle git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3784 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Font.H')
-rw-r--r--src/Fl_Font.H13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Fl_Font.H b/src/Fl_Font.H
index 49c7e5ab9..bca85a1ea 100644
--- a/src/Fl_Font.H
+++ b/src/Fl_Font.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Font.H,v 1.6.2.3.2.6 2004/08/25 00:20:25 matthiaswm Exp $"
+// "$Id: Fl_Font.H,v 1.6.2.3.2.7 2004/08/26 00:18:42 matthiaswm Exp $"
//
// Font definitions for the Fast Light Tool Kit (FLTK).
//
@@ -57,12 +57,11 @@ public:
short width[256];
bool knowMetrics;
# elif defined(__APPLE_QUARTZ__)
-#warning quartz
+#warning : minimal quartz, use ATS instead!
FL_EXPORT Fl_FontSize(const char* fontname, int size);
- short font, face, size;
- short ascent, descent;
- short width[256];
- bool knowMetrics;
+ char *q_name;
+ int size;
+ short ascent, descent, q_width;
# elif USE_XFT
XftFont* font;
const char* encoding;
@@ -103,5 +102,5 @@ FL_EXPORT char *fl_find_fontsize(char *name);
#endif
//
-// End of "$Id: Fl_Font.H,v 1.6.2.3.2.6 2004/08/25 00:20:25 matthiaswm Exp $".
+// End of "$Id: Fl_Font.H,v 1.6.2.3.2.7 2004/08/26 00:18:42 matthiaswm Exp $".
//