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_Gl_Window.cxx | |
| 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_Gl_Window.cxx')
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index f52703e85..88963b2b6 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -29,8 +29,6 @@ extern void gl_texture_reset(); #include "Fl_Gl_Choice.H" #ifdef __APPLE__ #include <FL/gl.h> -extern void gl_context_update(NSOpenGLContext*); -extern void gl_context_flushbuffer(NSOpenGLContext*); #endif #include <FL/Fl_Gl_Window.H> #include <stdlib.h> @@ -191,7 +189,7 @@ void Fl_Gl_Window::make_current() { if (Fl_X::i(this)->changed_resolution()){ Fl_X::i(this)->changed_resolution(false); invalidate(); - gl_context_update(context_); + Fl_X::GLcontext_update(context_); } #endif if (!context_) { @@ -406,7 +404,7 @@ void Fl_Gl_Window::flush() { } #ifdef __APPLE__ - gl_context_flushbuffer(context_); + Fl_X::GLcontext_flushbuffer(context_); #endif if (overlay==this && SWAP_TYPE != SWAP) { // fake overlay in front buffer @@ -436,7 +434,7 @@ void Fl_Gl_Window::resize(int X,int Y,int W,int H) { if (is_a_resize) valid(0); #ifdef __APPLE__ - if (Fl_X::i(this)->in_windowDidResize()) gl_context_update(context_); + if (Fl_X::i(this)->in_windowDidResize()) Fl_X::GLcontext_update(context_); #endif #if ! ( defined(__APPLE__) || defined(WIN32) ) |