summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2013-10-29 12:46:51 +0000
committerManolo Gouy <Manolo>2013-10-29 12:46:51 +0000
commit1ad6b09de74731f6f639bb879d51ce14ff7a2878 (patch)
tree37c90840144b73389919b4e292934d96d9670431 /FL
parentf9470425359e8180ebe73f9585a4f27531f72839 (diff)
Fix mac-specific STR#2999. Use PostScript font name to ask the system for a font, and full font name
to display a font name. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10011 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/mac.H3
1 files changed, 3 insertions, 0 deletions
diff --git a/FL/mac.H b/FL/mac.H
index ed1402823..6450aba83 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -57,6 +57,7 @@ typedef struct flCocoaRegion {
} *Fl_Region; // a region is the union of a series of rectangles
# include "Fl_Window.H"
+# include "../src/Fl_Font.H"
// Some random X equivalents
struct XPoint { int x, y; };
@@ -132,6 +133,8 @@ public:
static void screen_work_area(int &X, int &Y, int &W, int &H, int n); // compute work area of a given screen
static int next_marked_length; // next length of marked text after current marked text will have been replaced
static int insertion_point_location(int *px, int *py, int *pheight); // computes window coordinates & height of insertion point
+ static const int CoreText_threshold; // Mac OS version from which the Core Text API is used to display text
+ static Fl_Fontdesc* calc_fl_fonts(void); // computes the fl_fonts global variable
private:
static void relink(Fl_Window*, Fl_Window*);
bool subwindow;