mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler warnings (STR 2988), porting from branch-1.3.

Browse Source 
This commit is the accumulated patch introduced in branch 1.3
in svn r 11094, 11095, and 11096.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2016-01-31 04:33:54 +00:00
parent 642187dc1c
commit 0a6be0a83f
31 changed files with 407 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Paged_Device.H
View File

@ -3,7 +3,7 @@
//
// Printing support for the Fast Light Tool Kit (FLTK).
//
// Copyright 2010 by Bill Spitzak and others.
// Copyright 2010-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

4
FL/Fl_Table.H
View File

@ -966,7 +966,7 @@ public:
Fl_Widget::do_callback();
}
#if FL_DOXYGEN
#ifdef FL_DOXYGEN
/**
The Fl_Widget::when() function is used to set a group of flags, determining
when the widget callback is called:
@ -998,7 +998,7 @@ public:
void when(Fl_When flags);
#endif
#if FL_DOXYGEN
#ifdef FL_DOXYGEN
/**
Callbacks will be called depending on the setting of Fl_Widget::when().

2
FL/mac.H
View File

@ -3,7 +3,7 @@
//
// Mac header file for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2015 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

10
configh.cmake.in
View File

@ -4,7 +4,7 @@
*
* Configuration file for the Fast Light Tool Kit (FLTK).
*
* Copyright 1998-2015 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
@ -274,8 +274,8 @@
/*
* FLTK_USE_CAIRO
*
* Do we have the cairo library available and want extended cairo use in fltk ?
* will implies to link cairo.lib in all fltk based apps.
* Do we have the cairo library available and want extended cairo use in FLTK ?
* This implies to link cairo.lib in all FLTK based apps.
*/
#cmakedefine FLTK_USE_CAIRO 1
@ -333,8 +333,8 @@
* Do we have the dlsym() function and header?
*/
#cmakedefine HAVE_DLFCN_H 1
#cmakedefine HAVE_DLSYM 1
#cmakedefine01 HAVE_DLFCN_H
#cmakedefine01 HAVE_DLSYM
/*
* End of "$Id$".

10
configh.in
View File

@ -3,7 +3,7 @@
*
* Configuration file for the Fast Light Tool Kit (FLTK).
*
* Copyright 1998-2015 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
@ -273,8 +273,8 @@
/*
* FLTK_USE_CAIRO
*
* Do we have the cairo library available and want extended cairo use in fltk ?
* will implies to link cairo.lib in all fltk based apps.
* Do we have the cairo library available and want extended cairo use in FLTK ?
* This implies to link cairo.lib in all FLTK based apps.
*/
#undef FLTK_USE_CAIRO
@ -332,8 +332,8 @@
* Do we have the dlsym() function and header?
*/
#undef HAVE_DLFCN_H
#undef HAVE_DLSYM
#define HAVE_DLFCN_H 0
#define HAVE_DLSYM 0
/*
* End of "$Id$".

2
fltk-config.in
View File

@ -4,7 +4,7 @@
#
# FLTK configuration utility.
#
# Copyright 2000-2015 by Bill Spitzak and others.
# Copyright 2000-2016 by Bill Spitzak and others.
# Original version Copyright 2000 by James Dean Palmer
# Adapted by Vincent Penne and Michael Sweet
#

179
ide/VisualC2008/config.h
View File

@ -3,7 +3,7 @@
*
* Configuration file for the Fast Light Tool Kit (FLTK) for Visual C++.
*
* 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
@ -27,10 +27,14 @@
* BORDER_WIDTH:
*
* Thickness of FL_UP_BOX and FL_DOWN_BOX. Current 1,2, and 3 are
* supported. 3 is the historic FLTK look. 2 looks more like Microsoft
* Windows, KDE, and Qt, and is the default when building for Windows.
* 1 is a plausible future evolution... Note that this may be simulated
* at runtime by redefining the boxtypes using Fl::set_boxtype().
* supported.
*
* 3 is the historic FLTK look.
* 2 is the default and looks like Microsoft Windows, KDE, and Qt.
* 1 is a plausible future evolution...
*
* Note that this may be simulated at runtime by redefining the boxtypes
* using Fl::set_boxtype().
*/
#define BORDER_WIDTH 2
@ -53,6 +57,14 @@
#define HAVE_GL_GLU_H 1
/*
* HAVE_GLXGETPROCADDRESSARB:
*
* Do you have the OpenGL glXGetProcAddressARB() function?
*/
/* #undef HAVE_GLXGETPROCADDRESSARB */
/*
* USE_COLORMAP:
*
@ -62,6 +74,22 @@
#define USE_COLORMAP 1
/*
* HAVE_XINERAMA
*
* Do we have the Xinerama library to support multi-head displays?
*/
#define HAVE_XINERAMA 0
/*
* USE_XFT
*
* Use the new Xft library to draw anti-aliased text.
*/
#define USE_XFT 0
/*
* HAVE_XDBE:
*
@ -73,12 +101,63 @@
/*
* USE_XDBE:
*
* Actually try to use the double-buffer extension? Set this to zero
* disable use of XDBE without breaking the list_visuals program.
* Actually try to use the double-buffer extension?
*/
#define USE_XDBE HAVE_XDBE
/*
* HAVE_XFIXES:
*
* Do we have the X fixes extension?
*/
#define HAVE_XFIXES 0
/*
* HAVE_XCURSOR:
*
* Do we have the X cursor library?
*/
#define HAVE_XCURSOR 0
/*
* HAVE_XRENDER:
*
* Do we have the X render library?
*/
#define HAVE_XRENDER 0
/*
* HAVE_X11_XREGION_H:
*
* Do we have the X11 Xregion.h header file ?
*/
#define HAVE_X11_XREGION_H 0
/*
* __APPLE_QUARTZ__:
*
* All Apple implementations are now based on Quartz and Cocoa,
* so this flag should always be on for Mac OS X. This flag has
* no meaning on operating systems other than Mac OS X.
*/
/* #undef __APPLE_QUARTZ__ */
/*
* USE_X11
*
* Should we use X11 for the current platform
*
*/
/* #undef USE_X11 */
/*
* HAVE_OVERLAY:
*
@ -105,7 +184,11 @@
* Byte order of your machine: 1 = big-endian, 0 = little-endian.
*/
#ifdef __APPLE__
#include <mac_endianness.h>
#else
#define WORDS_BIGENDIAN 0
#endif
/*
* U16, U32, U64:
@ -116,10 +199,11 @@
#define U16 unsigned short
#define U32 unsigned
#undef U64
/* #undef U64 */
/*
* HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR:
* HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H,
* HAVE_SCANDIR, HAVE_SCANDIR_POSIX:
*
* Where is <dirent.h> (used only by fl_file_chooser and scandir).
*/
@ -129,18 +213,20 @@
/* #undef HAVE_SYS_DIR_H */
/* #undef HAVE_NDIR_H */
/* #undef HAVE_SCANDIR */
/* #undef HAVE_SCANDIR_POSIX */
/*
* Possibly missing sprintf-style functions:
*/
#undef HAVE_VSNPRINTF
#undef HAVE_SNPRINTF
/* #undef HAVE_VSNPRINTF */
/* #undef HAVE_SNPRINTF */
/*
* String functions...
* String functions and headers...
*/
/* #undef HAVE_STRINGS_H */
#define HAVE_STRCASECMP 1
/* #undef HAVE_STRLCAT */
/* #undef HAVE_STRLCPY */
@ -153,20 +239,36 @@
#define HAVE_LOCALECONV 1
/*
* HAVE_POLL:
* HAVE_SYS_SELECT_H:
*
* Use poll() if we don't have select().
* Whether or not select() call has its own header file.
*/
#define HAVE_POLL 0
#define HAVE_SYS_SELECT_H 0
/*
* HAVE_SYS_STDTYPES_H:
*
* Whether or not we have the <sys/stdtypes.h> header file.
*/
/* #undef HAVE_SYS_STDTYPES_H */
/*
* USE_POLL:
*
* Use the poll() call provided on Linux and Irix instead of select()
*/
#define USE_POLL 0
/*
* Do we have various image libraries?
*/
#define HAVE_LIBPNG
#define HAVE_LIBZ
#define HAVE_LIBJPEG
#define HAVE_LIBPNG 1
#define HAVE_LIBZ 1
#define HAVE_LIBJPEG 1
/*
* Do we have Cairo ?
@ -179,16 +281,49 @@
* Which header file do we include for libpng?
*/
#define HAVE_PNG_H
#undef HAVE_LIBPNG_PNG_H
#define HAVE_PNG_H 1
/* #undef HAVE_LIBPNG_PNG_H */
/*
* Do we have the png_xyz() functions?
*/
#define HAVE_PNG_GET_VALID
#define HAVE_PNG_SET_TRNS_TO_ALPHA
#define HAVE_PNG_GET_VALID 1
#define HAVE_PNG_SET_TRNS_TO_ALPHA 1
/*
* Do we have POSIX threading?
*/
/* #undef HAVE_PTHREAD */
/* #undef HAVE_PTHREAD_H */
/*
* Do we have the ALSA library?
*/
/* #undef HAVE_ALSA_ASOUNDLIB_H */
/*
* Do we have the long long type?
*/
/* #undef HAVE_LONG_LONG */
#ifdef HAVE_LONG_LONG
# define FLTK_LLFMT "%lld"
# define FLTK_LLCAST (long long)
#else
# define FLTK_LLFMT "%ld"
# define FLTK_LLCAST (long)
#endif /* HAVE_LONG_LONG */
/*
* Do we have the dlsym() function and header?
*/
#define HAVE_DLFCN_H 0
#define HAVE_DLSYM 0
/*
* End of "$Id: config.h 4454 2005-07-24 18:41:30Z matt $".

179
ide/VisualC2010/config.h
View File

@ -3,7 +3,7 @@
*
* Configuration file for the Fast Light Tool Kit (FLTK) for Visual C++.
*
* 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
@ -27,10 +27,14 @@
* BORDER_WIDTH:
*
* Thickness of FL_UP_BOX and FL_DOWN_BOX. Current 1,2, and 3 are
* supported. 3 is the historic FLTK look. 2 looks more like Microsoft
* Windows, KDE, and Qt, and is the default when building for Windows.
* 1 is a plausible future evolution... Note that this may be simulated
* at runtime by redefining the boxtypes using Fl::set_boxtype().
* supported.
*
* 3 is the historic FLTK look.
* 2 is the default and looks like Microsoft Windows, KDE, and Qt.
* 1 is a plausible future evolution...
*
* Note that this may be simulated at runtime by redefining the boxtypes
* using Fl::set_boxtype().
*/
#define BORDER_WIDTH 2
@ -53,6 +57,14 @@
#define HAVE_GL_GLU_H 1
/*
* HAVE_GLXGETPROCADDRESSARB:
*
* Do you have the OpenGL glXGetProcAddressARB() function?
*/
/* #undef HAVE_GLXGETPROCADDRESSARB */
/*
* USE_COLORMAP:
*
@ -62,6 +74,22 @@
#define USE_COLORMAP 1
/*
* HAVE_XINERAMA
*
* Do we have the Xinerama library to support multi-head displays?
*/
#define HAVE_XINERAMA 0
/*
* USE_XFT
*
* Use the new Xft library to draw anti-aliased text.
*/
#define USE_XFT 0
/*
* HAVE_XDBE:
*
@ -73,12 +101,63 @@
/*
* USE_XDBE:
*
* Actually try to use the double-buffer extension? Set this to zero
* disable use of XDBE without breaking the list_visuals program.
* Actually try to use the double-buffer extension?
*/
#define USE_XDBE HAVE_XDBE
/*
* HAVE_XFIXES:
*
* Do we have the X fixes extension?
*/
#define HAVE_XFIXES 0
/*
* HAVE_XCURSOR:
*
* Do we have the X cursor library?
*/
#define HAVE_XCURSOR 0
/*
* HAVE_XRENDER:
*
* Do we have the X render library?
*/
#define HAVE_XRENDER 0
/*
* HAVE_X11_XREGION_H:
*
* Do we have the X11 Xregion.h header file ?
*/
#define HAVE_X11_XREGION_H 0
/*
* __APPLE_QUARTZ__:
*
* All Apple implementations are now based on Quartz and Cocoa,
* so this flag should always be on for Mac OS X. This flag has
* no meaning on operating systems other than Mac OS X.
*/
/* #undef __APPLE_QUARTZ__ */
/*
* USE_X11
*
* Should we use X11 for the current platform
*
*/
/* #undef USE_X11 */
/*
* HAVE_OVERLAY:
*
@ -105,7 +184,11 @@
* Byte order of your machine: 1 = big-endian, 0 = little-endian.
*/
#ifdef __APPLE__
#include <mac_endianness.h>
#else
#define WORDS_BIGENDIAN 0
#endif
/*
* U16, U32, U64:
@ -116,10 +199,11 @@
#define U16 unsigned short
#define U32 unsigned
#undef U64
/* #undef U64 */
/*
* HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR:
* HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H,
* HAVE_SCANDIR, HAVE_SCANDIR_POSIX:
*
* Where is <dirent.h> (used only by fl_file_chooser and scandir).
*/
@ -129,18 +213,20 @@
/* #undef HAVE_SYS_DIR_H */
/* #undef HAVE_NDIR_H */
/* #undef HAVE_SCANDIR */
/* #undef HAVE_SCANDIR_POSIX */
/*
* Possibly missing sprintf-style functions:
*/
#undef HAVE_VSNPRINTF
#undef HAVE_SNPRINTF
/* #undef HAVE_VSNPRINTF */
/* #undef HAVE_SNPRINTF */
/*
* String functions...
* String functions and headers...
*/
/* #undef HAVE_STRINGS_H */
#define HAVE_STRCASECMP 1
/* #undef HAVE_STRLCAT */
/* #undef HAVE_STRLCPY */
@ -153,20 +239,36 @@
#define HAVE_LOCALECONV 1
/*
* HAVE_POLL:
* HAVE_SYS_SELECT_H:
*
* Use poll() if we don't have select().
* Whether or not select() call has its own header file.
*/
#define HAVE_POLL 0
#define HAVE_SYS_SELECT_H 0
/*
* HAVE_SYS_STDTYPES_H:
*
* Whether or not we have the <sys/stdtypes.h> header file.
*/
/* #undef HAVE_SYS_STDTYPES_H */
/*
* USE_POLL:
*
* Use the poll() call provided on Linux and Irix instead of select()
*/
#define USE_POLL 0
/*
* Do we have various image libraries?
*/
#define HAVE_LIBPNG
#define HAVE_LIBZ
#define HAVE_LIBJPEG
#define HAVE_LIBPNG 1
#define HAVE_LIBZ 1
#define HAVE_LIBJPEG 1
/*
* Do we have Cairo ?
@ -179,16 +281,49 @@
* Which header file do we include for libpng?
*/
#define HAVE_PNG_H
#undef HAVE_LIBPNG_PNG_H
#define HAVE_PNG_H 1
/* #undef HAVE_LIBPNG_PNG_H */
/*
* Do we have the png_xyz() functions?
*/
#define HAVE_PNG_GET_VALID
#define HAVE_PNG_SET_TRNS_TO_ALPHA
#define HAVE_PNG_GET_VALID 1
#define HAVE_PNG_SET_TRNS_TO_ALPHA 1
/*
* Do we have POSIX threading?
*/
/* #undef HAVE_PTHREAD */
/* #undef HAVE_PTHREAD_H */
/*
* Do we have the ALSA library?
*/
/* #undef HAVE_ALSA_ASOUNDLIB_H */
/*
* Do we have the long long type?
*/
/* #undef HAVE_LONG_LONG */
#ifdef HAVE_LONG_LONG
# define FLTK_LLFMT "%lld"
# define FLTK_LLCAST (long long)
#else
# define FLTK_LLFMT "%ld"
# define FLTK_LLCAST (long)
#endif /* HAVE_LONG_LONG */
/*
* Do we have the dlsym() function and header?
*/
#define HAVE_DLFCN_H 0
#define HAVE_DLSYM 0
/*
* End of "$Id: config.h 4454 2005-07-24 18:41:30Z matt $".

4
ide/VisualC6/config.h
View File

@ -15,8 +15,8 @@
#define U16 unsigned short
#define U32 unsigned
#undef U64
#define HAVE_VSNPRINTF 0
#define HAVE_SNPRINTF 0
#undef HAVE_VSNPRINTF
#undef HAVE_SNPRINTF
#define HAVE_STRCASECMP 1
#define HAVE_LOCALE_H 1
#define HAVE_LOCALECONV 1

2
src/Fl_Copy_Surface.cxx
View File

@ -3,7 +3,7 @@
//
// Copy-to-clipboard code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2014 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

2
src/Fl_Image_Surface.cxx
View File

@ -3,7 +3,7 @@
//
// Draw-to-image code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2014 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

6
src/Fl_Input.cxx
View File

@ -3,7 +3,7 @@
//
// Input widget for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2011 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
@ -730,7 +730,7 @@ int Fl_Input::handle(int event) {
// fall through:
case FL_DND_DRAG:
//int p = mouse_position(X, Y, W, H);
#if DND_OUT_XXXX
#ifdef DND_OUT_XXXX
if (Fl::focus()==this && (p>=dnd_save_position && p<=dnd_save_mark ||
p>=dnd_save_mark && p<=dnd_save_position)) {
position(dnd_save_position, dnd_save_mark);
@ -746,7 +746,7 @@ int Fl_Input::handle(int event) {
case FL_DND_LEAVE:
position(dnd_save_position, dnd_save_mark);
#if DND_OUT_XXXX
#ifdef DND_OUT_XXXX
if (!focused())
#endif
if (dnd_save_focus && dnd_save_focus != this) {

2
src/Fl_Paged_Device.cxx
View File

@ -3,7 +3,7 @@
//
// implementation of Fl_Paged_Device class for the Fast Light Tool Kit (FLTK).
//
// Copyright 2010-2014 by Bill Spitzak and others.
// Copyright 2010-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

2
src/Fl_cocoa.mm
View File

@ -3,7 +3,7 @@
//
// MacOS-Cocoa specific code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2015 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

4
src/Fl_grab.cxx
View File

@ -3,7 +3,7 @@
//
// Grab/release code 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
@ -47,7 +47,7 @@ extern void *fl_capture;
#endif
void Fl::grab(Fl_Window* win) {
#if USE_X11
#ifdef USE_X11
Fl_Window *fullscreen_win = NULL;
for (Fl_Window *W = Fl::first_window(); W; W = Fl::next_window(W)) {
if (W->fullscreen_active()) {

4
src/Fl_lock.cxx
View File

@ -3,7 +3,7 @@
//
// Multi-threading support code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2015 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
@ -255,7 +255,7 @@ void Fl::awake(void* msg) {
////////////////////////////////////////////////////////////////
// POSIX threading...
#elif HAVE_PTHREAD
#elif defined(HAVE_PTHREAD)
# include <unistd.h>
# include <fcntl.h>
# include <pthread.h>

4
src/Fl_win32.cxx
View File

@ -3,7 +3,7 @@
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2015 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
@ -48,7 +48,7 @@
// that makes fltk use easier as only fltk libs are now requested
// This idea could be extended to fltk libs themselves,
// implementer should then care about DLL linkage flags ...
# if (_MSC_VER>=1310)
# if defined(_MSC_VER) && (_MSC_VER>=1310)
# pragma comment (lib, "comctl32.lib")
# endif
#endif

4
src/Fl_x.cxx
View File

@ -3,7 +3,7 @@
//
// X specific code 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
@ -1869,7 +1869,7 @@ fprintf(stderr,"\n");*/
case 149: keysym = FL_Menu; break;
}
# endif
# if BACKSPACE_HACK
# ifdef BACKSPACE_HACK
// Attempt to fix keyboards that send "delete" for the key in the
// upper-right corner of the main keyboard. But it appears that
// very few of these remain?

4
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
View File

@ -3,7 +3,7 @@
//
// More font utilities for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2011 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
@ -39,6 +39,8 @@
// of the font name array.
#define ENDOFBUFFER 127 // sizeof(Fl_Font.fontname)-1
#define USE_OVERLAY 0
// turn a stored font name in "fltk format" into a pretty name:
const char* Fl::get_font_name(Fl_Font fnum, int* ap) {
Fl_Fontdesc *f = fl_fonts + fnum;

10
src/flstring.h
View File

@ -3,7 +3,7 @@
*
* Common string header file 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
@ -60,12 +60,12 @@ extern "C" {
# endif /* __cplusplus */
FL_EXPORT extern int fl_snprintf(char *, size_t, const char *, ...);
# if !HAVE_SNPRINTF
# ifndef HAVE_SNPRINTF
# define snprintf fl_snprintf
# endif /* !HAVE_SNPRINTF */
FL_EXPORT extern int fl_vsnprintf(char *, size_t, const char *, va_list ap);
# if !HAVE_VSNPRINTF
# ifndef HAVE_VSNPRINTF
# define vsnprintf fl_vsnprintf
# endif /* !HAVE_VSNPRINTF */
@ -75,12 +75,12 @@ FL_EXPORT extern int fl_vsnprintf(char *, size_t, const char *, va_list ap);
*/
FL_EXPORT extern size_t fl_strlcat(char *, const char *, size_t);
# if !HAVE_STRLCAT
# ifndef HAVE_STRLCAT
# define strlcat fl_strlcat
# endif /* !HAVE_STRLCAT */
FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t);
# if !HAVE_STRLCPY
# ifndef HAVE_STRLCPY
# define strlcpy fl_strlcpy
# endif /* !HAVE_STRLCPY */

6
src/gl_draw.cxx
View File

@ -3,7 +3,7 @@
//
// OpenGL drawing support routines for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2011 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
@ -179,7 +179,7 @@ void gl_remove_displaylist_fonts()
#endif
}
#if __APPLE__
#ifdef __APPLE__
static void gl_draw_textures(const char* str, int n);
#endif
@ -337,7 +337,7 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) {
glDrawPixels(w,h,d<4?GL_RGB:GL_RGBA,GL_UNSIGNED_BYTE,(const ulong*)b);
}
#if __APPLE__ || defined(FL_DOXYGEN)
#if defined(__APPLE__) || defined(FL_DOXYGEN)
/* Text drawing to an OpenGL scene under Mac OS X is implemented using textures, as recommended by Apple.
This allows to use any font at any size, and any Unicode character.
Some old Apple hardware doesn't implement the required GL_EXT_texture_rectangle extension.

6
src/glut_compatability.cxx
View File

@ -3,7 +3,7 @@
//
// GLUT emulation routines 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
@ -34,7 +34,7 @@
# define GLX_GLXEXT_LEGACY
# include <GL/glx.h>
# endif // HAVE_GLXGETPROCADDRESSARB
# ifdef HAVE_DLFCN_H
# if HAVE_DLFCN_H
# include <dlfcn.h>
# endif // HAVE_DLFCN_H
# define MAXWINDOWS 32
@ -443,7 +443,7 @@ GLUTproc glutGetProcAddress(const char *procName) {
# ifdef WIN32
return (GLUTproc)wglGetProcAddress((LPCSTR)procName);
# elif defined(HAVE_DLSYM) && defined(HAVE_DLFCN_H)
# elif (HAVE_DLSYM && HAVE_DLFCN_H)
char symbol[1024];
snprintf(symbol, sizeof(symbol), "_%s", procName);

8
src/numericsort.c
View File

@ -3,7 +3,7 @@
*
* Numeric sorting routine 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
@ -29,13 +29,13 @@
# include <dirent.h>
# else
# define dirent direct
# if HAVE_SYS_NDIR_H
# ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h>
# endif /* HAVE_SYS_NDIR_H */
# if HAVE_SYS_DIR_H
# ifdef HAVE_SYS_DIR_H
# include <sys/dir.h>
# endif /* HAVE_SYS_DIR_H */
# if HAVE_NDIR_H
# ifdef HAVE_NDIR_H
# include <ndir.h>
# endif /* HAVE_NDIR_H */
# endif /* HAVE_DIRENT_H */

6
src/vsnprintf.c
View File

@ -128,7 +128,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) {
case 'e' :
case 'f' :
case 'g' :
if ((width + 2) > sizeof(temp)) break;
if ((width + 2) > (int)sizeof(temp)) break;
sprintf(temp, tformat, va_arg(ap, double));
@ -153,7 +153,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) {
case 'o' :
case 'u' :
case 'x' :
if ((width + 2) > sizeof(temp)) break;
if ((width + 2) > (int)sizeof(temp)) break;
#ifdef HAVE_LONG_LONG
if (size == 'L')
@ -179,7 +179,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) {
break;
case 'p' : /* Pointer value */
if ((width + 2) > sizeof(temp)) break;
if ((width + 2) > (int)sizeof(temp)) break;
sprintf(temp, tformat, va_arg(ap, void *));

6
src/xutf8/utf8Input.c
View File

@ -28,7 +28,7 @@
#include <string.h>
#include <stdlib.h>
#if HAVE_LIBC_ICONV
#ifdef HAVE_LIBC_ICONV
#include <iconv.h>
#endif
/*
@ -60,7 +60,7 @@ typedef struct {
static int
XConvertEucTwToUtf8(char* buffer_return, int len) {
/* FIXME */
#if HAVE_LIBC_ICONV
#ifdef HAVE_LIBC_ICONV
iconv_t cd;
int cdl;
#else
@ -73,7 +73,7 @@ XConvertEucTwToUtf8(char* buffer_return, int len) {
/*b = */ buf = (char*) malloc((unsigned)len);
memcpy(buf, buffer_return, (unsigned) len);
#if HAVE_LIBC_ICONV
#ifdef HAVE_LIBC_ICONV
l = cdl = len;
cd = iconv_open("EUC-TW", "UTF-8");
iconv(cd, &b, &len, &buffer_return, &cdl);

2
test/device.cxx
View File

@ -3,7 +3,7 @@
//
// Device test program for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2011 by Roman Kantor and others.
// Copyright 1998-2016 by Roman Kantor 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

4
test/fractals.cxx
View File

@ -7,7 +7,7 @@
// demonstrate how to add FLTK controls to a GLUT program. The GLUT
// code is unchanged except for the end (search for FLTK to find changes).
//
// 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
@ -25,7 +25,7 @@
#include <FL/Fl.H>
#include <FL/fl_message.H>
int main(int, char**) {
fl_alert("This demo does not work without GL and GLU (%d)");
fl_alert("This demo does not work without GL and GLU");
return 1;
}
#else

4
test/list_visuals.cxx
View File

@ -11,7 +11,7 @@
// This file may be #included in another program to make a function to
// call to list the visuals. Fl.H must be included first to indicate this.
//
// 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
@ -37,6 +37,8 @@ int main(int, char**) {
#include <config.h>
#define HAVE_MULTIBUF 0
#ifndef Fl_H
#include <X11/Xlib.h>

4
test/threads.cxx
View File

@ -3,7 +3,7 @@
//
// Threading example program 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
@ -18,7 +18,7 @@
#include <config.h>
#if HAVE_PTHREAD || defined(WIN32)
#if defined(HAVE_PTHREAD) || defined(WIN32)
# include <FL/Fl.H>
# include <FL/Fl_Double_Window.H>
# include <FL/Fl_Browser.H>

4
test/threads.h
View File

@ -3,7 +3,7 @@
//
// Simple threading API 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
@ -34,7 +34,7 @@
#ifndef Threads_H
# define Threads_H
# if HAVE_PTHREAD_H
# ifdef HAVE_PTHREAD_H
// Use POSIX threading...
# include <pthread.h>

6
test/utf8.cxx
View File

@ -3,7 +3,7 @@
//
// UTF-8 test program 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
@ -421,7 +421,7 @@ int make_font_chooser(void)
// font_count = Fl::set_fonts("*");
#ifdef WIN32
font_count = Fl::set_fonts("*");
#elif __APPLE__
#elif defined(__APPLE__)
font_count = Fl::set_fonts("*");
#else
// Load the systems available fonts - ask for everything that claims to be
@ -582,7 +582,7 @@ int main(int argc, char** argv)
Fl::set_font(extra_font,
#ifdef WIN32
" Arial Unicode MS"
#elif __APPLE__
#elif defined(__APPLE__)
"Monaco"
#else
"-*-*-*-*-*-*-*-*-*-*-*-*-iso10646-1"