summaryrefslogtreecommitdiff
path: root/src/Fl_Font.H
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2016-01-03 22:54:29 +0000
committerMatthias Melcher <fltk@matthiasm.com>2016-01-03 22:54:29 +0000
commitacf6c881d36b675d755433d3cf48613bc46ed78d (patch)
tree13cebc8f8fd918767595da12fafb5a600db2feb3 /src/Fl_Font.H
parent933b00b9c9fe55d01a7f1c4831f171482806f85b (diff)
Updated platform specific #if's to report unimplemented code when compiling with FL_PORTING defined and WIN32 and __APPLE__ undefined>
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10989 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Font.H')
-rw-r--r--src/Fl_Font.H28
1 files changed, 25 insertions, 3 deletions
diff --git a/src/Fl_Font.H b/src/Fl_Font.H
index 7a98650b2..561f249a2 100644
--- a/src/Fl_Font.H
+++ b/src/Fl_Font.H
@@ -26,6 +26,13 @@
#include <config.h>
+#if defined(WIN32) || defined(__APPLE__)
+#elif defined(FL_PORTING)
+# pragma message "FL_PORTING: implement font descriptor details here"
+#else
+#endif
+
+
# if USE_XFT
typedef struct _XftFont XftFont;
# elif !defined(WIN32) && !defined(__APPLE__)
@@ -65,6 +72,8 @@ public:
//const char* encoding;
int angle;
FL_EXPORT Fl_Font_Descriptor(const char* xfontname, Fl_Fontsize size, int angle);
+# elif defined(FL_PORTING)
+# pragma message "FL_PORTING: define variables and storage types for font handling"
# else
XUtf8FontStruct* font; // X UTF-8 font information
FL_EXPORT Fl_Font_Descriptor(const char* xfontname);
@@ -87,15 +96,28 @@ struct Fl_Fontdesc {
const char *name;
char fontname[128]; // "Pretty" font name
Fl_Font_Descriptor *first; // linked list of sizes of this style
-# ifndef WIN32
+#ifdef WIN32
+#elif defined(__APPLE__)
char **xlist; // matched X font names
int n; // size of xlist, negative = don't free xlist!
-# endif
+#elif defined(FL_PORTING)
+# pragma message "FL_PORTING: do you need additional storage in Fl_Fontdesc?"
+#else
+ char **xlist; // matched X font names
+ int n; // size of xlist, negative = don't free xlist!
+#endif
};
extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table
-# ifndef WIN32
+#ifdef WIN32
+#elif defined(__APPLE__)
+// functions for parsing X font names:
+FL_EXPORT const char* fl_font_word(const char *p, int n);
+FL_EXPORT char *fl_find_fontsize(char *name);
+#elif defined(FL_PORTING)
+# pragma message "FL_PORTING: do you need additional functions for font handling?"
+#else
// functions for parsing X font names:
FL_EXPORT const char* fl_font_word(const char *p, int n);
FL_EXPORT char *fl_find_fontsize(char *name);