summaryrefslogtreecommitdiff
path: root/src/drivers/GDI/Fl_Font.H
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/GDI/Fl_Font.H')
-rw-r--r--src/drivers/GDI/Fl_Font.H30
1 files changed, 4 insertions, 26 deletions
diff --git a/src/drivers/GDI/Fl_Font.H b/src/drivers/GDI/Fl_Font.H
index fd36aab24..b530ec422 100644
--- a/src/drivers/GDI/Fl_Font.H
+++ b/src/drivers/GDI/Fl_Font.H
@@ -3,7 +3,7 @@
//
// Font definitions for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2011 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -26,39 +26,17 @@
#include <config.h>
-/**
- This a structure for an actual system font, with junk to
- help choose it and info on character sizes. Each Fl_Fontdesc has a
- linked list of these. These are created the first time each system
- font/size combination is used.
-*/
-class Fl_Font_Descriptor {
+class Fl_GDI_Font_Descriptor : public Fl_Font_Descriptor {
public:
- /** linked list for this Fl_Fontdesc */
- Fl_Font_Descriptor *next;
- Fl_Fontsize size; /**< font size */
-#ifndef FL_DOXYGEN // don't bother with platorm dependant details in the doc.
HFONT fid;
int *width[64];
TEXTMETRIC metr;
int angle;
- FL_EXPORT Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size);
+ FL_EXPORT Fl_GDI_Font_Descriptor(const char* fontname, Fl_Fontsize size);
# if HAVE_GL
- unsigned int listbase;// base of display list, 0 = none
char glok[64];
# endif // HAVE_GL
-
- FL_EXPORT ~Fl_Font_Descriptor();
-
-#endif // FL_DOXYGEN
-};
-
-//extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one
-
-struct Fl_Fontdesc {
- const char *name;
- char fontname[128]; // "Pretty" font name
- Fl_Font_Descriptor *first; // linked list of sizes of this style
+ FL_EXPORT ~Fl_GDI_Font_Descriptor();
};
extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table