Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 10:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed more Cocoa/Quartz references. Finally moved OS X font down a pixel.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7357 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2010-03-29 14:10:54 +00:00
parent b3d4755286
commit 024368d722
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluid/ide_maketools.cxx
+1 -2
View File
@@ -1431,8 +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 __APPLE_QUARTZ__ 1\n" fputs("#define __APPLE_QUARTZ__ 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"
"#define HAVE_DIRENT_H 1\n#define HAVE_SCANDIR 1\n" "#define HAVE_DIRENT_H 1\n#define HAVE_SCANDIR 1\n"
fluid/ide_xcode.cxx
+1 -2
View File
@@ -1493,8 +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 __APPLE_QUARTZ__ 1\n" fputs("#define __APPLE_QUARTZ__ 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"
"#define HAVE_DIRENT_H 1\n#define HAVE_SCANDIR 1\n" "#define HAVE_DIRENT_H 1\n#define HAVE_SCANDIR 1\n"
src/Fl_Bitmap.cxx
+1 -1
View File
@@ -352,7 +352,7 @@ Fl_Bitmap::~Fl_Bitmap() {
void Fl_Bitmap::uncache() { void Fl_Bitmap::uncache() {
if (id_) { if (id_) {
#ifdef __APPLE_COCOA__ #ifdef __APPLE_QUARTZ__
fl_delete_bitmask((Fl_Bitmask)id_); fl_delete_bitmask((Fl_Bitmask)id_);
#else #else
fl_delete_bitmask((Fl_Offscreen)id_); fl_delete_bitmask((Fl_Offscreen)id_);
src/Fl_Window.cxx
+2
View File
@@ -111,6 +111,8 @@ void Fl_Window::draw() {
draw_children(); draw_children();
#ifdef __APPLE_QUARTZ__ #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; extern CGContextRef fl_gc;
if (fl_gc && !parent() && resizable() && (!size_range_set || minh!=maxh || minw!=maxw)) { if (fl_gc && !parent() && resizable() && (!size_range_set || minh!=maxh || minw!=maxw)) {
int dx = Fl::box_dw(box())-Fl::box_dx(box()); int dx = Fl::box_dw(box())-Fl::box_dx(box());
src/fl_draw.cxx
+4 -2
View File
@@ -350,9 +350,11 @@ void fl_draw(
{ {
if ((!str || !*str) && !img) return; if ((!str || !*str) && !img) return;
if (w && h && !fl_not_clipped(x, y, w, h) && (align & FL_ALIGN_INSIDE)) 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); 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();
} }
/** /**
src/fl_font_mac.cxx
+1 -1
View File
@@ -403,7 +403,7 @@ void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) {
void fl_draw(const char *str, int n, float x, float y); 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) { 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);
} }
src/gl_draw.cxx
+1 -1
View File
@@ -132,7 +132,7 @@ void gl_font(int fontid, int size) {
} }
gl_fontsize = fl_fontsize; gl_fontsize = fl_fontsize;
#ifndef __APPLE_COCOA__ #ifndef __APPLE_QUARTZ__
glListBase(fl_fontsize->listbase); glListBase(fl_fontsize->listbase);
#endif #endif
} }