From 2a7e42c6a5c076ddb149ef465abc00d9b6c172fa Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Thu, 13 Aug 2009 00:35:45 +0000
Subject: [PATCH] This should fix Mac builds failing on GL stuff.

Originally committed to SVN as r3396.
---
 aegisub/src/video_context.cpp | 8 --------
 aegisub/src/video_display.cpp | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp
index 862fbb576..ad4013464 100644
--- a/aegisub/src/video_context.cpp
+++ b/aegisub/src/video_context.cpp
@@ -258,11 +258,7 @@ void VideoContext::SetVideo(const wxString &filename) {
 			grid->CommitChanges(true);
 
 			// Set GL context
-#ifdef __WXMAC__
-			GetGLContext(displayList.front())->SetCurrent();
-#else
 			GetGLContext(displayList.front())->SetCurrent(*displayList.front());
-#endif
 
 			// Choose a provider
 			provider = VideoProviderFactoryManager::GetProvider(filename);
@@ -554,11 +550,7 @@ GLuint VideoContext::GetFrameAsTexture(int n) {
 	lastFrame = n;
 
 	// Set context
-#ifdef __APPLE__
-	GetGLContext(displayList.front())->SetCurrent();
-#else
 	GetGLContext(displayList.front())->SetCurrent(*displayList.front());
-#endif
 	glEnable(GL_TEXTURE_2D);
 	if (glGetError() != 0) throw _T("Error enabling texture.");
 
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 910e58f18..45eed0929 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -206,11 +206,7 @@ try {
 
 	// Set GL context
 	//wxMutexLocker glLock(OpenGLWrapper::glMutex);
-#ifdef __WXMAC__
-	SetCurrent();
-#else
 	SetCurrent(*context->GetGLContext(this));
-#endif
 
 	// Get sizes
 	int w,h,sw,sh,pw,ph;