diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-03-29 10:54:18 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-03-29 10:54:18 +0000 |
| commit | 38aa53038c414dc079599a4aa9cabb2772400026 (patch) | |
| tree | 5403a8fe6d0dd8cd69242af7a00ccb910822c9cd | |
| parent | 699bf33e69074c1e11ba31ba3181eb886d98a550 (diff) | |
Started to remove USE_QUARTZ, as all Apple implementations use Quartz as their Graphics Rendering system now.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7353 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | configh.in | 3 | ||||
| -rw-r--r-- | fluid/ide_maketools.cxx | 2 | ||||
| -rw-r--r-- | fluid/ide_xcode.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Image.cxx | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/configh.in b/configh.in index c0b77d9ed..a004e5c5d 100644 --- a/configh.in +++ b/configh.in @@ -124,6 +124,9 @@ * supported by Apple. If USE_QUARTZ is defined, FLTK will be * compiled using Quartz instead. This flag has no meaning on * other operating systems. + * + * USE_QUARTZ is deprecated because all Apple implementations + * are now based on Quartz and Cocoa. Use __APPLE__ instead. */ #define USE_QUARTZ 0 diff --git a/fluid/ide_maketools.cxx b/fluid/ide_maketools.cxx index e71e51859..59c01969a 100644 --- a/fluid/ide_maketools.cxx +++ b/fluid/ide_maketools.cxx @@ -1431,7 +1431,7 @@ public: "#define BORDER_WIDTH 2\n#define HAVE_GL 1\n#define HAVE_GL_GLU_H 1\n" "#define USE_COLORMAP 1\n#define HAVE_XINERAMA 0\n#define USE_XFT 0\n" "#define HAVE_XDBE 0\n#define USE_XDBE HAVE_XDBE\n", f); - fputs("#define USE_QUARTZ 1\n#define __APPLE_QUARTZ__ 1\n" + fputs("#define __APPLE_QUARTZ__ 1\n" "#define __APPLE_COCOA__ 1\n#define HAVE_OVERLAY 0\n" "#define HAVE_GL_OVERLAY HAVE_OVERLAY\n#define WORDS_BIGENDIAN 0\n" "#define U16 unsigned short\n#define U32 unsigned\n" diff --git a/fluid/ide_xcode.cxx b/fluid/ide_xcode.cxx index d25791bf5..86632f986 100644 --- a/fluid/ide_xcode.cxx +++ b/fluid/ide_xcode.cxx @@ -1493,7 +1493,7 @@ public: "#define BORDER_WIDTH 2\n#define HAVE_GL 1\n#define HAVE_GL_GLU_H 1\n" "#define USE_COLORMAP 1\n#define HAVE_XINERAMA 0\n#define USE_XFT 0\n" "#define HAVE_XDBE 0\n#define USE_XDBE HAVE_XDBE\n", f); - fputs("#define USE_QUARTZ 1\n#define __APPLE_QUARTZ__ 1\n" + fputs("#define __APPLE_QUARTZ__ 1\n" "#define __APPLE_COCOA__ 1\n#define HAVE_OVERLAY 0\n" "#define HAVE_GL_OVERLAY HAVE_OVERLAY\n#define WORDS_BIGENDIAN 0\n" "#define U16 unsigned short\n#define U32 unsigned\n" diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index cc544efd3..c7a79bfd1 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -375,7 +375,7 @@ void Fl_RGB_Image::desaturate() { d(new_d); } -#if !defined(WIN32) && !USE_QUARTZ +#if !defined(WIN32) && !defined(__APPLE_QUARTZ__) // Composite an image with alpha on systems that don't have accelerated // alpha compositing... static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, int cy) { @@ -431,7 +431,7 @@ static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, i delete[] dst; } -#endif // !WIN32 && !USE_QUARTZ +#endif // !WIN32 && !__APPLE_QUARTZ__ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { if(fl_device->type() == Fl_Device::postscript_device) { |