diff options
| author | Manolo Gouy <Manolo> | 2010-01-24 10:05:19 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-01-24 10:05:19 +0000 |
| commit | bb58589936744cbf0834b6873d14a08c32cd9831 (patch) | |
| tree | e834fc6f2a308e1236c5bc1b592e0804306c10cf /src | |
| parent | 001a756b15cfc244acdf6d4444eb8f1ad49c32ab (diff) | |
New texture-based gl_draw implementation now used also in 32-but compiles
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7027 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/gl_draw.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 4d4e8ef76..03bde8852 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -110,7 +110,7 @@ void gl_font(int fontid, int size) { wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base); SelectObject(fl_gc, oldFid); # elif defined(__APPLE_QUARTZ__) -#if ! __LP64__ +#if ! defined(__APPLE_COCOA__) //AGL is not supported for use in 64-bit applications: //http://developer.apple.com/mac/library/documentation/Carbon/Conceptual/Carbon64BitGuide/OtherAPIChanges/OtherAPIChanges.html short font, face, size; @@ -132,7 +132,7 @@ void gl_font(int fontid, int size) { } gl_fontsize = fl_fontsize; -#if !( defined(__APPLE__) && __LP64__ ) +#if !( defined(__APPLE__) && defined(__APPLE_COCOA__) ) glListBase(fl_fontsize->listbase); #endif } @@ -210,14 +210,14 @@ void gl_remove_displaylist_fonts() Draws an array of n characters of the string in the current font at the current position. */ -#if defined(__APPLE__) && __LP64__ +#if defined(__APPLE__) && defined(__APPLE_COCOA__) static void gl_draw_cocoa(const char* str, int n); #endif void gl_draw(const char* str, int n) { #ifdef __APPLE__ -#if __LP64__ +#if defined(__APPLE_COCOA__) gl_draw_cocoa(str, n); #else // Should be converting the text here, as for other platforms??? @@ -367,7 +367,7 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { glDrawPixels(w,h,d<4?GL_RGB:GL_RGBA,GL_UNSIGNED_BYTE,(const ulong*)b); } -#if defined(__APPLE__) && defined(__APPLE_COCOA__) && __LP64__ +#if defined(__APPLE__) && defined(__APPLE_COCOA__) #include <FL/glu.h> |