diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-09 14:39:42 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-09 14:39:42 +0000 |
| commit | 52ae3582a2c7bb437df33c0a30bfd5a01d6c5282 (patch) | |
| tree | 4f532a97ab0a6a1c2f96454290bc8803ee022f1f /cairo | |
| parent | 30dad6a4aa2b94fe91783160c86abc75f9dc9e23 (diff) | |
Replace "WIN32" with "_WIN32" or "Windows".
Replace compiler/preprocessor/platform macro "WIN32" with "_WIN32".
Replace "WIN32" in text and documentation with "Windows".
Replace "MSWindows" with "Windows".
To do: README.Windows.txt (and maybe other documentation as well)
needs updates.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12655 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/Fl_Cairo.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cairo/Fl_Cairo.cxx b/cairo/Fl_Cairo.cxx index 803c4628c..7ddc87fa2 100644 --- a/cairo/Fl_Cairo.cxx +++ b/cairo/Fl_Cairo.cxx @@ -28,7 +28,7 @@ #if defined(USE_X11) // X11 # include <cairo-xlib.h> -#elif defined(WIN32) +#elif defined(_WIN32) # include <cairo-win32.h> #elif defined(__APPLE_QUARTZ__) // PORTME: Cairo Support # include <cairo-quartz.h> @@ -95,14 +95,14 @@ cairo_t * Fl::cairo_make_current(Fl_Window* wi) { /* Creates transparently a cairo_surface_t object. - gc is an HDC context in WIN32, a CGContext* in Quartz, and + gc is an HDC context in Windows, a CGContext* in Quartz, and a display on X11 (not used on this platform) */ static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) { # if defined(USE_X11) return cairo_xlib_surface_create(fl_display, fl_window, fl_visual->visual, W, H); -# elif defined(WIN32) +# elif defined(_WIN32) return cairo_win32_surface_create((HDC) gc); # elif defined(__APPLE_QUARTZ__) return cairo_quartz_surface_create_for_cg_context((CGContext*) gc, W, H); @@ -131,8 +131,8 @@ cairo_t * Fl::cairo_make_current(void *gc) { W = CGBitmapContextGetWidth(fl_gc); H = CGBitmapContextGetHeight(fl_gc); } -#elif defined(WIN32) - // we don't need any W,H for WIN32 +#elif defined(_WIN32) + // we don't need any W,H for Windows #else # error Cairo is not supported on this platform. #endif |