diff options
| author | Manolo Gouy <Manolo> | 2015-01-24 17:37:58 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-01-24 17:37:58 +0000 |
| commit | 00f66de2cd1cb0c9a526763ca56e8ce395a984a9 (patch) | |
| tree | e10acb0a8bde60e9838c300c8ca0a2ce8bdc04fb /src | |
| parent | ed547c6c63ee7e36ccf2a688cbc7ab83eb7d7f19 (diff) | |
Restore compilability with Mac OS X SDK 10.4u
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10534 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_cocoa.mm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 0cd9d1620..495806c97 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2637,16 +2637,16 @@ NSOpenGLPixelFormat* Fl_X::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) //list[n++] = AGL_GREEN_SIZE; //list[n++] = (m & FL_RGB8) ? 8 : 1; attribs[n++] = NSOpenGLPFAColorSize; - attribs[n++] = (m & FL_RGB8) ? 32 : 1; + attribs[n++] = (NSOpenGLPixelFormatAttribute)((m & FL_RGB8) ? 32 : 1); if (m & FL_ALPHA) { //list[n++] = AGL_ALPHA_SIZE; attribs[n++] = NSOpenGLPFAAlphaSize; - attribs[n++] = (m & FL_RGB8) ? 8 : 1; + attribs[n++] = (NSOpenGLPixelFormatAttribute)((m & FL_RGB8) ? 8 : 1); } if (m & FL_ACCUM) { //list[n++] = AGL_ACCUM_GREEN_SIZE; list[n++] = 1; attribs[n++] = NSOpenGLPFAAccumSize; - attribs[n++] = 1; + attribs[n++] = (NSOpenGLPixelFormatAttribute)1; if (m & FL_ALPHA) { //list[n++] = AGL_ACCUM_ALPHA_SIZE; list[n++] = 1; } @@ -2659,12 +2659,12 @@ NSOpenGLPixelFormat* Fl_X::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) if (m & FL_DEPTH) { //list[n++] = AGL_DEPTH_SIZE; list[n++] = 24; attribs[n++] = NSOpenGLPFADepthSize; - attribs[n++] = 24; + attribs[n++] = (NSOpenGLPixelFormatAttribute)24; } if (m & FL_STENCIL) { //list[n++] = AGL_STENCIL_SIZE; list[n++] = 1; attribs[n++] = NSOpenGLPFAStencilSize; - attribs[n++] = 1; + attribs[n++] = (NSOpenGLPixelFormatAttribute)1; } if (m & FL_STEREO) { //list[n++] = AGL_STEREO; @@ -2672,8 +2672,8 @@ NSOpenGLPixelFormat* Fl_X::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) } if (m & FL_MULTISAMPLE) { attribs[n++] = NSOpenGLPFAMultisample, - attribs[n++] = NSOpenGLPFASampleBuffers; attribs[n++] = 1; - attribs[n++] = NSOpenGLPFASamples; attribs[n++] = 4; + attribs[n++] = NSOpenGLPFASampleBuffers; attribs[n++] = (NSOpenGLPixelFormatAttribute)1; + attribs[n++] = NSOpenGLPFASamples; attribs[n++] = (NSOpenGLPixelFormatAttribute)4; } #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 if (fl_mac_os_version >= 100700) { @@ -2683,11 +2683,11 @@ NSOpenGLPixelFormat* Fl_X::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) #endif } else { while (alistp[n] && n < 30) { - attribs[n] = alistp[n]; + attribs[n] = (NSOpenGLPixelFormatAttribute)alistp[n]; n++; } } - attribs[n] = 0; + attribs[n] = (NSOpenGLPixelFormatAttribute)0; NSOpenGLPixelFormat *pixform = [[NSOpenGLPixelFormat alloc] initWithAttributes:attribs]; /*GLint color,alpha,accum,depth; [pixform getValues:&color forAttribute:NSOpenGLPFAColorSize forVirtualScreen:0]; |