From e6818b19a61dc4324505544aa5af15fd16e84eb9 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Tue, 18 Jul 2006 11:23:20 +0000
Subject: Fixed byte order in OS X cursor shape data. Added Xft font pointer
 fl_xftfont.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5262 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_font_x.cxx   | 1 +
 src/fl_font_xft.cxx | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx
index 6540cc275..2723a2197 100644
--- a/src/fl_font_x.cxx
+++ b/src/fl_font_x.cxx
@@ -196,6 +196,7 @@ static Fl_FontSize* find(int fnum, int size) {
 int fl_font_ = 0;
 int fl_size_ = 0;
 XFontStruct* fl_xfont = 0;
+void *fl_xftfont = 0;
 static GC font_gc;
 
 void fl_font(int fnum, int size) {
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx
index 1c6a451da..71fb3736d 100644
--- a/src/fl_font_xft.cxx
+++ b/src/fl_font_xft.cxx
@@ -91,6 +91,7 @@ Fl_Fontdesc* fl_fonts = built_in_table;
 int fl_font_ = 0;
 int fl_size_ = 0;
 XFontStruct* fl_xfont = 0;
+void *fl_xftfont = 0;
 const char* fl_encoding_ = "iso8859-1";
 Fl_FontSize* fl_fontsize = 0;
 
@@ -116,6 +117,7 @@ void fl_font(int fnum, int size) {
 #if XFT_MAJOR < 2
   fl_xfont    = f->font->u.core.font;
 #endif // XFT_MAJOR < 2
+  fl_xftfont = (void*)f->font;
 }
 
 static XftFont* fontopen(const char* name, bool core) {
-- 
cgit v1.2.3