diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-01 15:42:17 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-01 15:42:17 +0000 |
| commit | 82f5d08fd688a2e53d168ae34c77f8374e0f5a52 (patch) | |
| tree | 00c42aba93b499fece405d95b0763b6410b29732 | |
| parent | b083119f50f280d47b756c68235fcfdfa05b8f2e (diff) | |
Add cast for WIN32 font enumeration calls...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2051 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 1 | ||||
| -rwxr-xr-x | src/fl_set_fonts_win32.cxx | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.0 + - Added casts in fl_set_fonts_win32.cxx for VC++ 5.0. - Fl_File_Icon::find() did not check the basename of a filename for a match; this caused matches for a specific filename (e.g. "fluid") to fail. diff --git a/src/fl_set_fonts_win32.cxx b/src/fl_set_fonts_win32.cxx index 0f5b17dbb..696710ea8 100755 --- a/src/fl_set_fonts_win32.cxx +++ b/src/fl_set_fonts_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.5 2002/03/06 18:11:01 easysw Exp $" +// "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.6 2002/04/01 15:42:17 easysw Exp $" // // WIN32 font utilities for the Fast Light Tool Kit (FLTK). // @@ -73,7 +73,7 @@ enumcb(CONST LOGFONT *lpelf, Fl_Font Fl::set_fonts(const char* xstarname) { if (fl_free_font == FL_FREE_FONT) {// if not already been called if (!fl_gc) fl_GetDC(0); - EnumFontFamilies(fl_gc, NULL, enumcb, xstarname != 0); + EnumFontFamilies(fl_gc, NULL, (FONTENUMPROC)enumcb, xstarname != 0); } return (Fl_Font)fl_free_font; } @@ -127,7 +127,7 @@ Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { if (!fl_gc) fl_GetDC(0); cyPerInch = GetDeviceCaps(fl_gc, LOGPIXELSY); if (cyPerInch < 1) cyPerInch = 1; - EnumFontFamilies(fl_gc, s->name+1, EnumSizeCb, 0); + EnumFontFamilies(fl_gc, s->name+1, (FONTENUMPROC)EnumSizeCb, 0); sizep = sizes; return nbSize; @@ -135,5 +135,5 @@ Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { // -// End of "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.5 2002/03/06 18:11:01 easysw Exp $". +// End of "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.6 2002/04/01 15:42:17 easysw Exp $". // |