diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 00:39:57 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 00:39:57 +0000 |
| commit | 5c32d3b24ceec2005c38ec7e3335fead43b26d1d (patch) | |
| tree | 1453890859ba59b6ccc35715730045a91965d5cf /src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx | |
| parent | 6cc67c18f24d76ce890e16fb9e55217b8665680b (diff) | |
Update build system to compile all drivers as indiviual objects.
Removed obsolete files that served only one purpose: to #include
different driver files. Updated CMake and Makefiles to reflect the
changes. Build tested with:
- MinGW + configure/make
- MinGW + CMake/make
- Visual Studio 2010 generated by CMake
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx index 6f2504391..ba2dcda4f 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx @@ -3,7 +3,7 @@ // // WIN32 font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2016 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 @@ -16,6 +16,35 @@ // http://www.fltk.org/str.php // +#ifdef WIN32 +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +/* We require Windows 2000 features such as GetGlyphIndices */ +# if !defined(WINVER) || (WINVER < 0x0500) +# ifdef WINVER +# undef WINVER +# endif +# define WINVER 0x0500 +# endif +# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) +# ifdef _WIN32_WINNT +# undef _WIN32_WINNT +# endif +# define _WIN32_WINNT 0x0500 +# endif +#endif + +// Select fonts from the FLTK font table. +#include "../../flstring.h" +#include <FL/Fl.H> +#include <FL/fl_draw.H> +#include <FL/x.H> +#include "../../Fl_Font.H" + +#include <stdio.h> +#include <stdlib.h> + // This function fills in the FLTK font table with all the fonts that // are found on the X server. It tries to place the fonts into families // and to sort them so the first 4 in a family are normal, bold, italic, @@ -167,7 +196,7 @@ Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { // // WIN32 font selection routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2012 by Bill Spitzak and others. +// Copyright 1998-2016 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 |
