summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-03-26 21:56:24 +0000
committerManolo Gouy <Manolo>2011-03-26 21:56:24 +0000
commit8d7c246676447063657ea74c8ec81cfb68503b6a (patch)
treec85b72370ced0bdd33fa628b5589e4a426de9000 /src
parenta58a2ed9fb724ec54053f4ca5b22d2b7db523ada (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Gl_Window.cxx3
-rw-r--r--src/gl_draw.cxx6
2 files changed, 8 insertions, 1 deletions
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