From 8d7c246676447063657ea74c8ec81cfb68503b6a Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sat, 26 Mar 2011 21:56:24 +0000 Subject: Mac OS: added gl_texture_reset() function to be called when deleting an Fl_Gl_Window git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8537 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Gl_Window.cxx | 3 ++- src/gl_draw.cxx | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 2730787d2..ceca337ee 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -474,7 +474,8 @@ Fl_Gl_Window::~Fl_Gl_Window() { // delete overlay; this is done by ~Fl_Group #ifdef __APPLE__ // resets the pile of string textures used to draw strings - gl_texture_pile_height(gl_texture_pile_height()); + extern void gl_texture_reset(); + gl_texture_reset(); #endif } diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index da2acff4c..4b86f0346 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -564,6 +564,12 @@ void gl_texture_pile_height(int max) int gl_texture_pile_height(void) {return 0;} void gl_texture_pile_height(int max) {} #endif // GL_DRAW_USES_TEXTURES +#if defined(__APPLE__) +void gl_texture_reset() +{ + if (gl_fifo) gl_texture_pile_height(gl_texture_pile_height()); +} +#endif #endif // HAVE_GL -- cgit v1.2.3