Author: matt
Date: 2010-03-29 07:10:54 -0700 (Mon, 29 Mar 2010)
New Revision: 7357
Log:
Removed more Cocoa/Quartz references. Finally moved OS X font down a pixel.
Modified:
branches/branch-1.3/fluid/ide_maketools.cxx
branches/branch-1.3/fluid/ide_xcode.cxx
branches/branch-1.3/src/Fl_Bitmap.cxx
branches/branch-1.3/src/Fl_Window.cxx
branches/branch-1.3/src/fl_draw.cxx
branches/branch-1.3/src/fl_font_mac.cxx
branches/branch-1.3/src/gl_draw.cxx
Modified: branches/branch-1.3/fluid/ide_maketools.cxx
===================================================================
--- branches/branch-1.3/fluid/ide_maketools.cxx 2010-03-29 12:52:28 UTC (rev
7356)
+++ branches/branch-1.3/fluid/ide_maketools.cxx 2010-03-29 14:10:54 UTC (rev
7357)
@@ -1431,8 +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 __APPLE_QUARTZ__ 1\n"
- "#define __APPLE_COCOA__ 1\n#define HAVE_OVERLAY 0\n"
+ fputs("#define __APPLE_QUARTZ__ 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"
"#define HAVE_DIRENT_H 1\n#define HAVE_SCANDIR 1\n"
Modified: branches/branch-1.3/fluid/ide_xcode.cxx
===================================================================
--- branches/branch-1.3/fluid/ide_xcode.cxx 2010-03-29 12:52:28 UTC (rev
7356)
+++ branches/branch-1.3/fluid/ide_xcode.cxx 2010-03-29 14:10:54 UTC (rev
7357)
@@ -1493,8 +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 __APPLE_QUARTZ__ 1\n"
- "#define __APPLE_COCOA__ 1\n#define HAVE_OVERLAY 0\n"
+ fputs("#define __APPLE_QUARTZ__ 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"
"#define HAVE_DIRENT_H 1\n#define HAVE_SCANDIR 1\n"
Modified: branches/branch-1.3/src/Fl_Bitmap.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Bitmap.cxx 2010-03-29 12:52:28 UTC (rev
7356)
+++ branches/branch-1.3/src/Fl_Bitmap.cxx 2010-03-29 14:10:54 UTC (rev
7357)
@@ -352,7 +352,7 @@
void Fl_Bitmap::uncache() {
if (id_) {
-#ifdef __APPLE_COCOA__
+#ifdef __APPLE_QUARTZ__
fl_delete_bitmask((Fl_Bitmask)id_);
#else
fl_delete_bitmask((Fl_Offscreen)id_);
Modified: branches/branch-1.3/src/Fl_Window.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Window.cxx 2010-03-29 12:52:28 UTC (rev
7356)
+++ branches/branch-1.3/src/Fl_Window.cxx 2010-03-29 14:10:54 UTC (rev
7357)
@@ -111,6 +111,8 @@
draw_children();
#ifdef __APPLE_QUARTZ__
+ // on OS X, windows have no frame. To resize a window, we drag the lower
right
+ // corner. This code draws a little ribbed triangle for dragging.
extern CGContextRef fl_gc;
if (fl_gc && !parent() && resizable() && (!size_range_set || minh!=maxh ||
minw!=maxw)) {
int dx = Fl::box_dw(box())-Fl::box_dx(box());
Modified: branches/branch-1.3/src/fl_draw.cxx
===================================================================
--- branches/branch-1.3/src/fl_draw.cxx 2010-03-29 12:52:28 UTC (rev 7356)
+++ branches/branch-1.3/src/fl_draw.cxx 2010-03-29 14:10:54 UTC (rev 7357)
@@ -350,9 +350,11 @@
{
if ((!str || !*str) && !img) return;
if (w && h && !fl_not_clipped(x, y, w, h) && (align & FL_ALIGN_INSIDE))
return;
- if (align & FL_ALIGN_CLIP) fl_push_clip(x, y, w, h);
+ if (align & FL_ALIGN_CLIP)
+ fl_push_clip(x, y, w, h);
fl_draw(str, x, y, w, h, align, fl_draw, img, draw_symbols);
- if (align & FL_ALIGN_CLIP) fl_pop_clip();
+ if (align & FL_ALIGN_CLIP)
+ fl_pop_clip();
}
/**
Modified: branches/branch-1.3/src/fl_font_mac.cxx
===================================================================
--- branches/branch-1.3/src/fl_font_mac.cxx 2010-03-29 12:52:28 UTC (rev
7356)
+++ branches/branch-1.3/src/fl_font_mac.cxx 2010-03-29 14:10:54 UTC (rev
7357)
@@ -403,7 +403,7 @@
void fl_draw(const char *str, int n, float x, float y);
void Fl_Device::draw(const char* str, int n, int x, int y) {
- fl_draw(str, n, (float)x-0.0f, (float)y-0.5f);
+ fl_draw(str, n, (float)x-0.0f, (float)y+0.5f);
}
Modified: branches/branch-1.3/src/gl_draw.cxx
===================================================================
--- branches/branch-1.3/src/gl_draw.cxx 2010-03-29 12:52:28 UTC (rev 7356)
+++ branches/branch-1.3/src/gl_draw.cxx 2010-03-29 14:10:54 UTC (rev 7357)
@@ -132,7 +132,7 @@
}
gl_fontsize = fl_fontsize;
-#ifndef __APPLE_COCOA__
+#ifndef __APPLE_QUARTZ__
glListBase(fl_fontsize->listbase);
#endif
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
