diff options
Diffstat (limited to 'src/drivers')
18 files changed, 58 insertions, 60 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H index ef64799c9..f9631198e 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H @@ -4,7 +4,7 @@ // Definition of Apple Cocoa window driver // for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2016 by Bill Spitzak and others. +// Copyright 2010-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 @@ -52,7 +52,7 @@ class FLWindow; - window types and styles, depth, etc. - decorations - ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx? + ? where do we handle the interface between OpenGL/DirectX and Cocoa/Windows/Glx? */ struct Fl_Window_Driver::shape_data_type { Fl_Image* shape_; ///< shape image diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx index ddcf5b812..1662f6847 100644 --- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx +++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx @@ -205,7 +205,7 @@ char *Fl_Darwin_System_Driver::preference_rootnode(Fl_Preferences *prefs, Fl_Pre { static char filename[ FL_PATH_MAX ]; // TODO: verify that this is the Apple sanctioned way of finding these folders - // (On MSWindows, this frequently leads to issues with internationalized systems) + // (On Windows, this frequently leads to issues with internationalized systems) // Carbon: err = FindFolder( kLocalDomain, kPreferencesFolderType, 1, &spec.vRefNum, &spec.parID ); switch (root) { case Fl_Preferences::SYSTEM: diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H index 8de2a9a1d..1ab61722b 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H @@ -19,7 +19,7 @@ /** \file Fl_GDI_Graphics_Driver.H - \brief Definition of MSWindows GDI graphics driver. + \brief Definition of Windows GDI graphics driver. */ #ifndef FL_GDI_GRAPHICS_DRIVER_H @@ -30,10 +30,10 @@ /** - \brief The MSWindows-specific graphics class. - * - This class is implemented only on the MSWindows platform. - */ + \brief The Windows-specific graphics driver class. + + This class is implemented only on the Windows platform. +*/ class FL_EXPORT Fl_GDI_Graphics_Driver : public Fl_Scalable_Graphics_Driver { private: BOOL alpha_blend_(int x, int y, int w, int h, HDC src_gc, int srcx, int srcy, int srcw, int srch); @@ -151,10 +151,11 @@ protected: /** - The graphics driver used when printing on MSWindows. - * - This class is implemented only on the MSWindows platform. It 's extremely similar to Fl_GDI_Graphics_Driver. - */ + The graphics driver used when printing on Windows. + + This class is implemented only on the Windows platform. + It is extremely similar to Fl_GDI_Graphics_Driver. +*/ class FL_EXPORT Fl_GDI_Printer_Graphics_Driver : public Fl_GDI_Graphics_Driver { private: typedef BOOL (WINAPI* transparent_f_type) (HDC,int,int,int,int,HDC,int,int,int,int,UINT); diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index 4a49db6d5..e4088b0c0 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -25,7 +25,7 @@ /* * By linking this module, the following static method will instantiate the - * MSWindows GDI Graphics driver as the main display driver. + * Windows GDI Graphics driver as the main display driver. */ Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver() { @@ -53,7 +53,7 @@ void Fl_GDI_Graphics_Driver::global_gc() } /* - * This function checks if the version of MSWindows that we + * This function checks if the version of Windows that we * curently run on supports alpha blending for bitmap transfers * and finds the required function if so. */ diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx index c9d74e59e..7127682cc 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx @@ -1,7 +1,7 @@ // // "$Id$" // -// WIN32 font utilities for the Fast Light Tool Kit (FLTK). +// Windows font utilities for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2018 by Bill Spitzak and others. // @@ -16,23 +16,21 @@ // http://www.fltk.org/str.php // -#ifdef WIN32 -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif +#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 +#if !defined(WINVER) || (WINVER < 0x0500) +# ifdef WINVER +# undef WINVER # endif -# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) -# ifdef _WIN32_WINNT -# undef _WIN32_WINNT -# endif -# define _WIN32_WINNT 0x0500 +# define WINVER 0x0500 +#endif +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) +# ifdef _WIN32_WINNT +# undef _WIN32_WINNT # endif +# define _WIN32_WINNT 0x0500 #endif // Select fonts from the FLTK font table. diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx index 63dded34d..31d308464 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx @@ -1,7 +1,7 @@ // // "$Id$" // -// WIN32 image drawing code for the Fast Light Tool Kit (FLTK). +// Windows image drawing code for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2018 by Bill Spitzak and others. // @@ -414,7 +414,7 @@ void Fl_GDI_Graphics_Driver::draw_unscaled(Fl_Bitmap *bm, float s, int XP, int Y int save = SaveDC(tempdc); SelectObject(tempdc, (HGDIOBJ)*Fl_Graphics_Driver::id(bm)); SelectObject(gc_, fl_brush()); - // secret bitblt code found in old MSWindows reference manual: + // secret bitblt code found in old Windows reference manual: BitBlt(gc_, X, Y, W, H, tempdc, cx, cy, 0xE20746L); RestoreDC(tempdc, save); DeleteDC(tempdc); diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx index d347cc6a8..0dbb674f0 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx @@ -19,7 +19,7 @@ /** \file Fl_GDI_Graphics_Driver_rect.cxx - \brief MSWindows GDI specific line and polygon drawing with integer coordinates. + \brief Windows GDI specific line and polygon drawing with integer coordinates. */ #include <config.h> diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx index b8ee81d65..caace8b39 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx @@ -20,7 +20,7 @@ \file Fl_GDI_Graphics_Driver_vertex.cxx \brief Portable drawing code for drawing arbitrary shapes with - simple 2D transformations, implemented for MSWindows GDI. + simple 2D transformations, implemented for Windows GDI. */ #include "Fl_GDI_Graphics_Driver.H" diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx index 193f766cb..f6586aa85 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx @@ -3,7 +3,7 @@ // // Color functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2016 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 @@ -21,8 +21,8 @@ \brief Color handling */ -#include <config.h> #include "../../config_lib.h" +// #include <config.h> #include "Fl_OpenGL_Graphics_Driver.H" #include <FL/gl.h> #include <FL/Fl_Gl_Window.H> @@ -37,7 +37,7 @@ void Fl_OpenGL_Graphics_Driver::color(Fl_Color i) { // FIXME: do we need the code below? /* #if HAVE_GL_OVERLAY -#if defined(WIN32) +#if defined(_WIN32) if (fl_overlay && fl_overlay_depth) { if (fl_overlay_depth < 8) { // only black & white produce the expected colors. This could diff --git a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx index 2c318d0b4..7492074a7 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx @@ -1,9 +1,9 @@ // // "$Id$" // -// Support for WIN32 printing for the Fast Light Tool Kit (FLTK). +// Printing support for Windows for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2016 by Bill Spitzak and others. +// Copyright 2010-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 @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -#ifdef WIN32 +#ifdef _WIN32 #include "../GDI/Fl_GDI_Graphics_Driver.H" #include <FL/Fl_Printer.H> @@ -27,7 +27,7 @@ extern HWND fl_window; -/** Support for printing on the MSWindows platform */ +/** Support for printing on the Windows platform */ class Fl_WinAPI_Printer_Driver : public Fl_Paged_Device { friend class Fl_Paged_Device; private: @@ -318,7 +318,7 @@ void Fl_WinAPI_Printer_Driver::origin(int *x, int *y) Fl_Paged_Device::origin(x, y); } -#endif // WIN32 +#endif // _WIN32 // // End of "$Id$". diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H index b5d238ba9..d6dfaf889 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H @@ -1,7 +1,7 @@ // // "$Id$" // -// Definition of MSWindows Win32/64 Screen interface +// Definition of Windows screen interface // for the Fast Light Tool Kit (FLTK). // // Copyright 2010-2018 by Bill Spitzak and others. @@ -19,7 +19,7 @@ /** \file Fl_WinAPI_Screen_Driver.H - \brief Definition of MSWindows Win32/64 Screen interface. + \brief Definition of Windows screen interface. */ #ifndef FL_WINAPI_SCREEN_DRIVER_H diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx index f44fa7a3c..4521038f0 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx @@ -1,7 +1,7 @@ // // "$Id$" // -// Definition of MSWindows Win32/64 Screen interface +// Windows screen interface for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2018 by Bill Spitzak and others. // @@ -275,7 +275,7 @@ void Fl_WinAPI_Screen_Driver::flush() extern void fl_fix_focus(); // in Fl.cxx // We have to keep track of whether we have captured the mouse, since -// MSWindows shows little respect for this... Grep for fl_capture to +// Windows shows little respect for this... Grep for fl_capture to // see where and how this is used. extern HWND fl_capture; diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H index 0f376a00a..0fe23cfda 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H @@ -1,10 +1,9 @@ // // "$Id$" // -// Definition of MSWindows system driver -// for the Fast Light Tool Kit (FLTK). +// Definition of Windows system driver for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2017 by Bill Spitzak and others. +// Copyright 2010-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 @@ -19,7 +18,7 @@ /** \file Fl_WinAPI_System_Driver.H - \brief Definition of MSWindows system driver. + \brief Definition of Windows system driver. */ #ifndef FL_WINAPI_SYSTEM_DRIVER_H diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index 26a41bd61..f2b56e0e0 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of Apple Darwin system driver. // -// 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 @@ -155,7 +155,7 @@ Fl_System_Driver *Fl_System_Driver::newSystemDriver() } void Fl_WinAPI_System_Driver::warning(const char *format, va_list args) { - // Show nothing for warnings under WIN32... + // Show nothing for warnings under Windows... } void Fl_WinAPI_System_Driver::error(const char *format, va_list args) { @@ -308,7 +308,7 @@ int Fl_WinAPI_System_Driver::rename(const char *fnam, const char *newnam) { return _wrename(wbuf, wbuf1); } -// Two WIN32-specific functions fl_utf8_to_locale() and fl_locale_to_utf8() +// Two Windows-specific functions fl_utf8_to_locale() and fl_locale_to_utf8() // from file fl_utf8.cxx are put here for API compatibility static char *buf = NULL; @@ -721,7 +721,7 @@ int Fl_WinAPI_System_Driver::file_browser_load_filesystem(Fl_File_Browser *brows endmntent(m); # else // - // Normal WIN32 code uses drive bits... + // Normal Windows code uses drive bits... // DWORD drives; // Drive available bits drives = GetLogicalDrives(); @@ -729,7 +729,7 @@ int Fl_WinAPI_System_Driver::file_browser_load_filesystem(Fl_File_Browser *brows if (drives & 1) { sprintf(filename, "%c:/", i); - if (i < 'C') // see also: GetDriveType and GetVolumeInformation in WIN32 + if (i < 'C') // see also: GetDriveType and GetVolumeInformation in Windows browser->add(filename, icon); else browser->add(filename, icon); diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H index 576d42736..7e67f2355 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H @@ -4,7 +4,7 @@ // Definition of Apple Cocoa window driver // for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2016 by Bill Spitzak and others. +// Copyright 2010-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 @@ -19,7 +19,7 @@ /** \file Fl_WinAPI_Window_Driver.H - \brief Definition of MSWindows window driver. + \brief Definition of Windows window driver. */ #ifndef FL_WINAPI_WINDOW_DRIVER_H @@ -40,7 +40,7 @@ - window types and styles, depth, etc. - decorations - ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx? + ? where do we handle the interface between OpenGL/DirectX and Cocoa/Windows/Glx? */ diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H index ad1c29c3d..c84949e3b 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -42,7 +42,7 @@ class Fl_Bitmap; - window types and styles, depth, etc. - decorations - ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx? + ? where do we handle the interface between OpenGL/DirectX and Cocoa/Windows/Glx? */ diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx index 34ae4bd38..da88cc00e 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx @@ -32,7 +32,7 @@ void Fl_Xlib_Graphics_Driver::line_style_unscaled(int style, float width, char* dashes) { int ndashes = dashes ? strlen(dashes) : 0; - // emulate the WIN32 dash patterns on X + // emulate the Windows dash patterns on X char buf[7]; if (!ndashes && (style&0xff)) { int w = width ? width : 1; diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx index 954b36b60..10d6f4875 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx @@ -142,7 +142,7 @@ int Fl_Xlib_Graphics_Driver::clip_x (int x) { } // Missing X call: (is this the fastest way to init a 1-rectangle region?) -// MSWindows equivalent exists, implemented inline in win32.H +// Windows equivalent exists, implemented inline in win32.H Fl_Region Fl_Xlib_Graphics_Driver::XRectangleRegion(int x, int y, int w, int h) { XRectangle R; clip_to_short(x, y, w, h, line_width_); |