Author: matt
Date: 2010-03-29 03:54:18 -0700 (Mon, 29 Mar 2010)
New Revision: 7353
Log:
Started to remove USE_QUARTZ, as all Apple implementations use Quartz as their
Graphics Rendering system now.
Modified:
branches/branch-1.3/configh.in
branches/branch-1.3/fluid/ide_maketools.cxx
branches/branch-1.3/fluid/ide_xcode.cxx
branches/branch-1.3/src/Fl_Image.cxx
Modified: branches/branch-1.3/configh.in
===================================================================
--- branches/branch-1.3/configh.in 2010-03-29 10:47:11 UTC (rev 7352)
+++ branches/branch-1.3/configh.in 2010-03-29 10:54:18 UTC (rev 7353)
@@ -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
Modified: branches/branch-1.3/fluid/ide_maketools.cxx
===================================================================
--- branches/branch-1.3/fluid/ide_maketools.cxx 2010-03-29 10:47:11 UTC (rev
7352)
+++ branches/branch-1.3/fluid/ide_maketools.cxx 2010-03-29 10:54:18 UTC (rev
7353)
@@ -1431,7 +1431,7 @@
"#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"
Modified: branches/branch-1.3/fluid/ide_xcode.cxx
===================================================================
--- branches/branch-1.3/fluid/ide_xcode.cxx 2010-03-29 10:47:11 UTC (rev
7352)
+++ branches/branch-1.3/fluid/ide_xcode.cxx 2010-03-29 10:54:18 UTC (rev
7353)
@@ -1493,7 +1493,7 @@
"#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"
Modified: branches/branch-1.3/src/Fl_Image.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Image.cxx 2010-03-29 10:47:11 UTC (rev
7352)
+++ branches/branch-1.3/src/Fl_Image.cxx 2010-03-29 10:54:18 UTC (rev
7353)
@@ -375,7 +375,7 @@
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 @@
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) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
