diff options
| author | Manolo Gouy <Manolo> | 2016-04-02 13:22:48 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-02 13:22:48 +0000 |
| commit | d011d5b4f060166f87fc44594f7f31ddf6b652e9 (patch) | |
| tree | 45d6edbcd0dcad0abf71a76a146be36716b0a927 /src/fl_font.cxx | |
| parent | c03f3d8946c3a68aea2c8c11705e04eeff0e02c9 (diff) | |
Replace src/Fl_Font.H by one file for each platform.
This file contained nearly only platform-specific code.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11507 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_font.cxx')
| -rw-r--r-- | src/fl_font.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/fl_font.cxx b/src/fl_font.cxx index c6ae5ec77..f662b839e 100644 --- a/src/fl_font.cxx +++ b/src/fl_font.cxx @@ -22,7 +22,13 @@ #include <FL/Fl.H> #include <FL/x.H> #include <FL/fl_draw.H> -#include "Fl_Font.H" +#if defined(__APPLE__) +#include "drivers/Quartz/Fl_Font.H" +#elif defined(WIN32) +#include "drivers/GDI/Fl_Font.H" +#elif USE_X11 +#include "drivers/Xlib/Fl_Font.H" +#endif #include <stdio.h> #include <stdlib.h> @@ -31,16 +37,6 @@ // all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx // ----------------------------------------------------------------------------- -#if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Graphics_Driver - platform font stuff -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: do you need the XFontStruct ?" -#else -XFontStruct *fl_X_core_font() -{ - return fl_xfont.value(); -} -#endif - double fl_width(const char* c) { if (c) return fl_width(c, (int) strlen(c)); else return 0.0f; |