From 878f451d72392b9d8be9f6f9e2e15f58d43eebd9 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Fri, 4 Sep 2009 05:12:49 +0000 Subject: [PATCH] Remove an old hack required for wx2.8, this is no longer required for 2.9. Closes #850. Originally committed to SVN as r3483. --- aegisub/src/video_context.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp index ad4013464..96e5176e4 100644 --- a/aegisub/src/video_context.cpp +++ b/aegisub/src/video_context.cpp @@ -488,23 +488,10 @@ void VideoContext::JumpToTime(int ms,bool exact) { /// @return /// wxGLContext *VideoContext::GetGLContext(wxGLCanvas *canvas) { - // wxGLCanvas and wxGLContext is a funky couple. - // On wxMac wxGLContext has a different constructor than everywhere else... - // But wxMac is also the only implementation that creates and initialises a context - // in the canvas constructor, meaning a wxGLCanvas on wxMac comes with a context - // for free, while we have to create our own everywhere else. - // So let's first see if the canvas might already have a context of its own and - // get that if we lack one. - // That should always succeed on wxMac... - // Everywhere else, we can just create a wxGLContext using the documented interface - // and be over with it after that. - // Also see bug #850. -#ifndef __WXMAC__ if (!glContext) { glContext = new wxGLContext(canvas); ownGlContext = true; } -#endif return glContext; }