diff options
| author | Manolo Gouy <Manolo> | 2015-02-02 13:08:51 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-02-02 13:08:51 +0000 |
| commit | 5017171db80080eeb1404410c9c7086767731675 (patch) | |
| tree | b80ed153d367a9691887c0d55119385bcf886c69 /src/Fl_cocoa.mm | |
| parent | f8ee30ef746e4d9dcc270b1c435474f0e2007a2b (diff) | |
Replace gl_xxx() function names by new member functions of the Fl_X class to avoid
collisions with user-defined symbols.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10548 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
| -rw-r--r-- | src/Fl_cocoa.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 0e3aa85cd..938ac4c67 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2724,7 +2724,7 @@ NSOpenGLPixelFormat* Fl_X::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) return pixform; } -NSOpenGLContext* gl_create_context_for_window(NSOpenGLPixelFormat *pixelformat, +NSOpenGLContext* Fl_X::create_GLcontext_for_window(NSOpenGLPixelFormat *pixelformat, NSOpenGLContext *shared_ctx, Fl_Window *window) { NSOpenGLContext *context = [[NSOpenGLContext alloc] initWithFormat:pixelformat shareContext:shared_ctx]; @@ -2732,27 +2732,27 @@ NSOpenGLContext* gl_create_context_for_window(NSOpenGLPixelFormat *pixelformat, return context; } -void gl_context_update(NSOpenGLContext* ctxt) +void Fl_X::GLcontext_update(NSOpenGLContext* ctxt) { [ctxt update]; } -void gl_context_flushbuffer(NSOpenGLContext* ctxt) +void Fl_X::GLcontext_flushbuffer(NSOpenGLContext* ctxt) { [ctxt flushBuffer]; } -void gl_context_release(NSOpenGLContext* ctxt) +void Fl_X::GLcontext_release(NSOpenGLContext* ctxt) { [ctxt release]; } -void gl_cleardrawable(void) +void Fl_X::GL_cleardrawable(void) { [[NSOpenGLContext currentContext] clearDrawable]; } -void gl_context_makecurrent(NSOpenGLContext* ctxt) +void Fl_X::GLcontext_makecurrent(NSOpenGLContext* ctxt) { [ctxt makeCurrentContext]; } |