diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2006-07-18 11:23:20 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2006-07-18 11:23:20 +0000 |
| commit | e6818b19a61dc4324505544aa5af15fd16e84eb9 (patch) | |
| tree | e30df5404d36e24dad579b4bf28977650ac2102c /src | |
| parent | b6f3595669994fe03169b4b85791c644b184845c (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_font_x.cxx | 1 | ||||
| -rw-r--r-- | src/fl_font_xft.cxx | 2 |
2 files changed, 3 insertions, 0 deletions
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) { |