mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Matthias Melcher 2010-03-29 10:54:18 +00:00
parent 699bf33e69
commit 38aa53038c
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configh.in
View File

@ -124,6 +124,9 @@
* supported by Apple. If USE_QUARTZ is defined, FLTK will be * supported by Apple. If USE_QUARTZ is defined, FLTK will be
* compiled using Quartz instead. This flag has no meaning on * compiled using Quartz instead. This flag has no meaning on
* other operating systems. * 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 #define USE_QUARTZ 0

2
fluid/ide_maketools.cxx
View File

@ -1431,7 +1431,7 @@ public:
"#define BORDER_WIDTH 2\n#define HAVE_GL 1\n#define HAVE_GL_GLU_H 1\n" "#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 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); "#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 __APPLE_COCOA__ 1\n#define HAVE_OVERLAY 0\n"
"#define HAVE_GL_OVERLAY HAVE_OVERLAY\n#define WORDS_BIGENDIAN 0\n" "#define HAVE_GL_OVERLAY HAVE_OVERLAY\n#define WORDS_BIGENDIAN 0\n"
"#define U16 unsigned short\n#define U32 unsigned\n" "#define U16 unsigned short\n#define U32 unsigned\n"

2
fluid/ide_xcode.cxx
View File

@ -1493,7 +1493,7 @@ public:
"#define BORDER_WIDTH 2\n#define HAVE_GL 1\n#define HAVE_GL_GLU_H 1\n" "#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 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); "#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 __APPLE_COCOA__ 1\n#define HAVE_OVERLAY 0\n"
"#define HAVE_GL_OVERLAY HAVE_OVERLAY\n#define WORDS_BIGENDIAN 0\n" "#define HAVE_GL_OVERLAY HAVE_OVERLAY\n#define WORDS_BIGENDIAN 0\n"
"#define U16 unsigned short\n#define U32 unsigned\n" "#define U16 unsigned short\n#define U32 unsigned\n"

4
src/Fl_Image.cxx
View File

@ -375,7 +375,7 @@ void Fl_RGB_Image::desaturate() {
d(new_d); 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 // Composite an image with alpha on systems that don't have accelerated
// alpha compositing... // alpha compositing...
static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, int cy) { 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; 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) { 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) { if(fl_device->type() == Fl_Device::postscript_device) {