summaryrefslogtreecommitdiff
path: root/src/drivers/GDI
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-04-02 13:22:48 +0000
committerManolo Gouy <Manolo>2016-04-02 13:22:48 +0000
commitd011d5b4f060166f87fc44594f7f31ddf6b652e9 (patch)
tree45d6edbcd0dcad0abf71a76a146be36716b0a927 /src/drivers/GDI
parentc03f3d8946c3a68aea2c8c11705e04eeff0e02c9 (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/drivers/GDI')
-rw-r--r--src/drivers/GDI/Fl_Font.H70
-rw-r--r--src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx2
2 files changed, 71 insertions, 1 deletions
diff --git a/src/drivers/GDI/Fl_Font.H b/src/drivers/GDI/Fl_Font.H
new file mode 100644
index 000000000..c6d467cc3
--- /dev/null
+++ b/src/drivers/GDI/Fl_Font.H
@@ -0,0 +1,70 @@
+//
+// "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $"
+//
+// Font definitions for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2011 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
+// file is missing or damaged, see the license at:
+//
+// http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+// Two internal fltk data structures:
+//
+// Fl_Fontdesc: an entry into the fl_font() table. There is one of these
+// for each fltk font number.
+//
+#ifndef FL_FONT_
+#define FL_FONT_
+
+#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 {
+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);
+# 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
+};
+
+extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table
+
+#endif
+
+//
+// End of "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $".
+//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
index 9de668c69..3f1b31223 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
@@ -41,7 +41,7 @@
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/x.H>
-#include "../../Fl_Font.H"
+#include "Fl_Font.H"
#include <stdio.h>
#include <stdlib.h>