diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl.H | 22 | ||||
| -rw-r--r-- | FL/Fl_Copy_Surface.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Export.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Gl_Window.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Graphics_Driver.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Input.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Native_File_Chooser.H | 18 | ||||
| -rw-r--r-- | FL/Fl_Preferences.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Printer.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Window.H | 2 | ||||
| -rw-r--r-- | FL/filename.H | 4 | ||||
| -rw-r--r-- | FL/fl_draw.H | 4 | ||||
| -rw-r--r-- | FL/fl_utf8.h | 8 | ||||
| -rw-r--r-- | FL/gl.h | 2 | ||||
| -rw-r--r-- | FL/glu.h | 2 | ||||
| -rw-r--r-- | FL/math.h | 4 | ||||
| -rw-r--r-- | FL/platform.H | 2 | ||||
| -rw-r--r-- | FL/platform_types.h | 6 | ||||
| -rw-r--r-- | FL/win32.H | 4 |
19 files changed, 51 insertions, 51 deletions
@@ -146,27 +146,27 @@ public: // run time information about compile time configuration /** @{ */ static bool cfg_gfx_xlib; ///< X11 Xlib rendering available, usually on Linux systems static bool cfg_gfx_quartz; ///< Quartz rendering available, usually on OS X systems - static bool cfg_gfx_gdi; ///< GDI rendering available, usually on MSWindows systems + static bool cfg_gfx_gdi; ///< GDI rendering available, usually on Windows systems static bool cfg_gfx_opengl; ///< OpenGL rendering available, available on many platforms static bool cfg_gfx_cairo; ///< Cairo rendering available, available on many platforms - static bool cfg_gfx_directx;///< DirectX rendering available, usually on MSWindows systems + static bool cfg_gfx_directx;///< DirectX rendering available, usually on Windows systems /** @} */ /** \defgroup cfg_prn runtime printer driver configuration */ /** @{ */ static bool cfg_prn_ps; ///< PostScript rendering available, usually on Linux systems static bool cfg_prn_quartz; ///< Quartz rendering available, usually on OS X systems - static bool cfg_prn_gdi; ///< GDI rendering available, usually on MSWindows systems + static bool cfg_prn_gdi; ///< GDI rendering available, usually on Windows systems /** @} */ /** \defgroup cfg_win runtime window and event manager configuration */ /** @{ */ static bool cfg_win_x11; ///< X11 window management available, usually on Linux systems static bool cfg_win_cocoa; ///< Cocoa window management available, usually on OS X systems - static bool cfg_win_win32; ///< WIN32 window management available, on low level MSWindows + static bool cfg_win_win32; ///< Windows window management available, on low level Windows /** @} */ /** \defgroup cfg_sys runtime system configuration */ /** @{ */ static bool cfg_sys_posix; ///< Posix system available, usually on Linux and OS X systems, but also Cygwin - static bool cfg_sys_win32; ///< WIN32 system available, on MSWindows + static bool cfg_sys_win32; ///< Windows system available, on Windows /** @} */ public: // should be private! @@ -195,7 +195,7 @@ public: // should be private! static Fl_Widget* selection_owner_; static Fl_Window* modal_; static Fl_Window* grab_; - static int compose_state; // used for dead keys (WIN32) or marked text (MacOS) + static int compose_state; // used for dead keys (Windows) or marked text (MacOS) static void call_screen_init(); // recompute screen number and dimensions static void reset_marked_text(); // resets marked text static void insertion_point_location(int x, int y, int height); // sets window coordinates & height of insertion point @@ -507,7 +507,7 @@ int main() { Under UNIX <I>any</I> file descriptor can be monitored (files, devices, pipes, sockets, etc.). Due to limitations in Microsoft Windows, - WIN32 applications can only monitor sockets. + Windows applications can only monitor sockets. */ static void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); // platform dependent /** See void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) */ @@ -609,7 +609,7 @@ int main() { focus is (including in other programs). The window <I>does not have to be shown()</I> , this lets the handle() method of a "dummy" window override all event handling and allows you to - map and unmap a complex set of windows (under both X and WIN32 + map and unmap a complex set of windows (under both X and Windows <I>some</I> window must be mapped because the system interface needs a window id). @@ -813,7 +813,7 @@ int main() { On X Fl::get_key(FL_Button+n) does not work. - On WIN32 Fl::get_key(FL_KP_Enter) and Fl::event_key(FL_KP_Enter) do not work. + On Windows Fl::get_key(FL_KP_Enter) and Fl::event_key(FL_KP_Enter) do not work. */ static int event_key(int key); /** @@ -939,7 +939,7 @@ int main() { \par Platform details for image data: \li Unix/Linux platform: Clipboard images in PNG or BMP formats are recognized. Requires linking with the fltk_images library. - \li MSWindows platform: Both bitmap and vectorial (Enhanced metafile) data from clipboard + \li Windows platform: Both bitmap and vectorial (Enhanced metafile) data from clipboard can be pasted as image data. \li Mac OS X platform: Both bitmap (TIFF) and vectorial (PDF) data from clipboard can be pasted as image data. @@ -1090,7 +1090,7 @@ int main() { "-*" will select all fonts with any encoding as long as they have normal X font names with dashes in them. Passing "*" will list every font that exists (on X this may produce some strange output). Other - values may be useful but are system dependent. With WIN32 NULL + values may be useful but are system dependent. With Windows NULL selects fonts with ISO8859-1 encoding and non-NULL selects all fonts. diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H index 7c2c60b04..0d7a4f17c 100644 --- a/FL/Fl_Copy_Surface.H +++ b/FL/Fl_Copy_Surface.H @@ -39,7 +39,7 @@ Fl_Display_Device::display_device()->set_current(); // direct graphics requests back to the display \endcode Platform details: - \li MSWindows: Transparent RGB images copy without transparency. + \li Windows: Transparent RGB images copy without transparency. The graphical data are copied to the clipboard as an 'enhanced metafile'. \li Mac OS: The graphical data are copied to the clipboard (a.k.a. pasteboard) in two 'flavors': 1) in vectorial form as PDF data; 2) in bitmap form as a TIFF image. diff --git a/FL/Fl_Export.H b/FL/Fl_Export.H index c239910eb..1b51c2584 100644 --- a/FL/Fl_Export.H +++ b/FL/Fl_Export.H @@ -1,9 +1,9 @@ /* * "$Id$" * - * WIN32 DLL export . + * Windows DLL export . * - * Copyright 1998-2010 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 @@ -20,7 +20,7 @@ # define Fl_Export_H /* - * The following is only used when building DLLs under WIN32... + * The following is only used when building DLLs under Windows... */ # if defined(FL_DLL) diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index 135a343fa..0c483e59e 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -166,7 +166,7 @@ public: mode() must not be called within draw() since it changes the current context. - \note On the <b>MSWindows and Unix/Linux platforms</b>, FLTK produces + \note On the <b>Windows and Unix/Linux platforms</b>, FLTK produces contexts for the highest OpenGL version supported by the hardware. Such contexts are also compatible with lower OpenGL versions. On the <b>Apple OS X platform</b>, it is necessary to decide whether the source code targets @@ -186,7 +186,7 @@ public: the <tt>glXChooseVisual()</tt> function (e.g., <tt>GLX_DOUBLEBUFFER</tt>, defined by including <GL/glx.h>). \note What attributes are adequate here is subject to change. The preferred, stable public API is Fl_Gl_Window::mode(int a). - <p><b>MSWindows platform</b>: this member function is of no use. + <p><b>Windows platform</b>: this member function is of no use. <p><b>Mac OS X platform</b>: attributes belong to the <tt>CGLPixelFormatAttribute</tt> enumeration (defined by including <tt><OpenGL/OpenGL.h></tt>, e.g., <tt>kCGLPFADoubleBuffer</tt>) and may be followed by adequate attribute values. diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H index 27778da2f..7445eeae3 100644 --- a/FL/Fl_Graphics_Driver.H +++ b/FL/Fl_Graphics_Driver.H @@ -1,7 +1,7 @@ // // "$Id$" // -// Definition of classes Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device +// Definition of classes Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device // for the Fast Light Tool Kit (FLTK). // // Copyright 2010-2018 by Bill Spitzak and others. @@ -444,7 +444,7 @@ struct Fl_Fontdesc { - scale and unscale the clipping region. This class is presently used on the X11 platform to support HiDPI displays. - In the future, it may also be used on the WIN32 platform. + In the future, it may also be used on the Windows platform. */ class FL_EXPORT Fl_Scalable_Graphics_Driver : public Fl_Graphics_Driver { public: diff --git a/FL/Fl_Input.H b/FL/Fl_Input.H index 4c5ff17d4..dc04ae020 100644 --- a/FL/Fl_Input.H +++ b/FL/Fl_Input.H @@ -31,7 +31,7 @@ characters, and will correctly display any UTF text, using ^X notation for unprintable control characters. It assumes the font can draw any characters of the used scripts, which is true - for standard fonts under MSWindows and Mac OS X. + for standard fonts under Windows and Mac OS X. Characters can be input using the keyboard or the character palette/map. Character composition is done using dead keys and/or a compose key as defined by the operating system. diff --git a/FL/Fl_Native_File_Chooser.H b/FL/Fl_Native_File_Chooser.H index 4a9221573..ec88a925f 100644 --- a/FL/Fl_Native_File_Chooser.H +++ b/FL/Fl_Native_File_Chooser.H @@ -21,21 +21,21 @@ Fl_Native_File_Chooser widget. */ /* Implementation note: - + class Fl_Native_File_Chooser <== public API used by applications - + class Fl_Native_File_Chooser_Driver <== virtual API that a platform may implement this API has a do-nothing default implementation - + class Fl_Native_File_Chooser_FLTK_Driver <== this API implementation is the default FLTK file chooser class Fl_GTK_Native_File_Chooser_Driver <== this API implementation runs a GTK file chooser it is determined at run-time if the GTK dynamic libraries are available - + class Fl_Quartz_Native_File_Chooser_Driver <== this API implementation runs a Mac OS X file chooser - class Fl_WinAPI_Native_File_Chooser_Driver <== this API implementation runs a MSWindows file chooser - - + class Fl_WinAPI_Native_File_Chooser_Driver <== this API implementation runs a Windows file chooser + + Each platform must implement the constructor of the Fl_Native_File_Chooser class. This particular implementation: @@ -97,8 +97,8 @@ class Fl_Native_File_Chooser_Driver; The Fl_Native_File_Chooser widget transmits UTF-8 encoded filenames to its user. It is recommended to open files that may have non-ASCII names with the fl_fopen() or - fl_open() utility functions that handle these names in a cross-platform way - (whereas the standard fopen()/open() functions fail on the MSWindows platform + fl_open() utility functions that handle these names in a cross-platform way + (whereas the standard fopen()/open() functions fail on the Windows platform to open files with a non-ASCII name). <B>Platform Specific Caveats</B> diff --git a/FL/Fl_Preferences.H b/FL/Fl_Preferences.H index 70b6d705a..db0708967 100644 --- a/FL/Fl_Preferences.H +++ b/FL/Fl_Preferences.H @@ -1,7 +1,7 @@ // // "$Id$" // -// Preferences . +// Preferences implementation for the Fast Light Tool Kit (FLTK). // // Copyright 2002-2010 by Matthias Melcher. // @@ -30,7 +30,7 @@ settings between application starts. It is similar to the - Registry on WIN32 and Preferences on MacOS, and provides a + Registry on Windows and Preferences on MacOS, and provides a simple configuration mechanism for UNIX. Fl_Preferences uses a hierarchy to store data. It diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H index 32cbe0d88..148897f2e 100644 --- a/FL/Fl_Printer.H +++ b/FL/Fl_Printer.H @@ -78,7 +78,7 @@ before creation of the Fl_Printer object. Use Fl_PostScript_File_Device::file_chooser_title to customize the title of the file chooser dialog that opens when using the "Print To File" option of the print dialog. - <li>MSWindows platform: Transparent Fl_RGB_Image 's don't print with exact transparency on most printers + <li>Windows platform: Transparent Fl_RGB_Image 's don't print with exact transparency on most printers (a workaround is to use print_window_part() ). Fl_RGB_Image 's don't rotate() well. <li>Mac OS X platform: all graphics requests print as on display and accept rotation and scaling. diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 9d9492606..3ad0d4081 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -348,7 +348,7 @@ public: void icon(const Fl_RGB_Image*); void icons(const Fl_RGB_Image*[], int); -#if defined(WIN32) && !defined(FL_DOXYGEN) +#if defined(_WIN32) && !defined(FL_DOXYGEN) typedef struct HICON__* HICON; // These 2 member functions break the driver model but are kept for back compatibility. // They are implemented in Fl_win32.cxx diff --git a/FL/filename.H b/FL/filename.H index 949bacc11..a82d1ec6a 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -3,7 +3,7 @@ * * Filename header file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2010 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 @@ -56,7 +56,7 @@ FL_EXPORT int fl_filename_isdir(const char *name); # if defined(__cplusplus) && !defined(FL_DOXYGEN) /* - * Under WIN32, we include filename.H from numericsort.c; this should probably change... + * Under Windows, we include filename.H from numericsort.c; this should probably change... */ inline char *fl_filename_setext(char *to, const char *ext) { return fl_filename_setext(to, FL_PATH_MAX, ext); } diff --git a/FL/fl_draw.H b/FL/fl_draw.H index 56500f661..46a60fb14 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -3,7 +3,7 @@ // // Portable drawing function header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2017 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 @@ -286,7 +286,7 @@ inline void fl_yxline(int x, int y, int y1, int x2, int y3) {fl_graphics_driver- Draw ellipse sections using integer coordinates. These functions match the rather limited circle drawing code provided by X - and WIN32. The advantage over using fl_arc with floating point coordinates + and Windows. The advantage over using fl_arc with floating point coordinates is that they are faster because they often use the hardware, and they draw much nicer small circles, since the small sizes are often hard-coded bitmaps. diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h index f855f977f..5f759418a 100644 --- a/FL/fl_utf8.h +++ b/FL/fl_utf8.h @@ -3,7 +3,7 @@ * * Author: Jean-Marc Lienher ( http://oksid.ch ) * Copyright 2000-2010 by O'ksi'D. - * Copyright 2016-2017 by Bill Spitzak and others. + * Copyright 2016-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 @@ -121,14 +121,14 @@ FL_EXPORT char* fl_utf2mbcs(const char *src); FL_EXPORT unsigned fl_utf8from_mb(char *dst, unsigned dstlen, const char *src, unsigned srclen); /*****************************************************************************/ -#ifdef WIN32 -/* these two WIN32-only functions are kept for API compatibility */ +#ifdef _WIN32 +/* these two Windows-only functions are kept for API compatibility */ /* OD: Attempt to convert the UTF-8 string to the current locale */ FL_EXPORT char *fl_utf8_to_locale(const char *s, int len, unsigned int codepage); /* OD: Attempt to convert a string in the current locale to UTF-8 */ FL_EXPORT char *fl_locale_to_utf8(const char *s, int len, unsigned int codepage); -#endif /* WIN32 */ +#endif /* _WIN32 */ /***************************************************************************** * The following functions are intended to provide portable, UTF-8 aware @@ -44,7 +44,7 @@ # define FL_gl_H # include "Enumerations.H" // for color names -# ifdef WIN32 +# ifdef _WIN32 # include <windows.h> # endif # ifndef APIENTRY @@ -27,7 +27,7 @@ # define FL_glu_H # include "Enumerations.H" // for color names -# ifdef WIN32 +# ifdef _WIN32 # include <windows.h> # endif # ifndef APIENTRY @@ -42,12 +42,12 @@ # define M_SQRT1_2 0.70710678118654752440 # endif // !M_SQRT2 -# if (defined(WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__) +# if (defined(_WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__) inline double rint(double v) {return floor(v+.5);} inline double copysign(double a, double b) {return b<0 ? -a : a;} -# endif // (WIN32 || CRAY) && !__MINGW32__ && !__MWERKS__ +# endif // (_WIN32 || CRAY) && !__MINGW32__ && !__MWERKS__ #endif // !fl_math_h diff --git a/FL/platform.H b/FL/platform.H index 7b54856db..7bb8807ad 100644 --- a/FL/platform.H +++ b/FL/platform.H @@ -35,7 +35,7 @@ # include <FL/fl_types.h> // for uchar class Fl_Window; -# ifdef WIN32 +# ifdef _WIN32 # include "win32.H" # elif defined(__APPLE__) # include "mac.H" diff --git a/FL/platform_types.h b/FL/platform_types.h index ce2e6718f..6eec3cd79 100644 --- a/FL/platform_types.h +++ b/FL/platform_types.h @@ -70,7 +70,7 @@ typedef int FL_SOCKET; # define FL_COMMAND FL_META # define FL_CONTROL FL_CTRL -#elif defined(WIN32) +#elif defined(_WIN32) typedef struct HBITMAP__ *HBITMAP; typedef HBITMAP Fl_Offscreen; typedef HBITMAP Fl_Bitmask; @@ -116,8 +116,8 @@ typedef struct __GLXcontextRec *GLContext; #ifndef __APPLE__ -# define FL_COMMAND FL_CTRL /**< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X */ -# define FL_CONTROL FL_META /**< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X */ +# define FL_COMMAND FL_CTRL /**< An alias for FL_CTRL on Windows and X11, or FL_META on MacOS X */ +# define FL_CONTROL FL_META /**< An alias for FL_META on Windows and X11, or FL_CTRL on MacOS X */ #endif #endif /* FL_PLATFORM_TYPES_H */ diff --git a/FL/win32.H b/FL/win32.H index 0d8253d40..0b77e1674 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -1,7 +1,7 @@ // // "$Id$" // -// WIN32 header file for the Fast Light Tool Kit (FLTK). +// Windows system header file for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2018 by Bill Spitzak and others. // @@ -17,7 +17,7 @@ // // Do not directly include this file, instead use <FL/platform.H>. It will -// include this file if WIN32 is defined. This is to encourage +// include this file if _WIN32 is defined. This is to encourage // portability of even the system-specific code... #ifndef FL_DOXYGEN |