From e4e7a7dc0021058b9410c1395dfed436ca7253f3 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Mon, 3 Jun 2013 06:10:16 +0000
Subject: [PATCH] bugfix g3d viewer glewinit was not working

---
 source/g3d_viewer/main.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index 63436129..c65cd16c 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -474,6 +474,13 @@ void MainWindow::setupTimer() {
 }
 
 void MainWindow::setupStartupSettings() {
+	 GLuint err = glewInit();
+	 if (GLEW_OK != err) {
+		fprintf(stderr, "Error [main]: glewInit failed: %s\n", glewGetErrorString(err));
+		//return 1;
+		throw std::runtime_error((char *)glewGetErrorString(err));
+	 }
+
 	renderer= Renderer::getInstance();
 
 	for(unsigned int i = 0; i < autoScreenShotParams.size(); ++i) {
@@ -555,19 +562,14 @@ void MainWindow::init() {
 
 #if wxCHECK_VERSION(2, 9, 3)
 	glCanvas->setCurrentGLContext();
+	//printf("setcurrent #1\n");
 #elif wxCHECK_VERSION(2, 9, 1)
 
 #else
 	glCanvas->SetCurrent();
+	//printf("setcurrent #2\n");
 #endif
 
-	 GLuint err = glewInit();
-	 if (GLEW_OK != err) {
-		fprintf(stderr, "Error [main]: glewInit failed: %s\n", glewGetErrorString(err));
-		//return 1;
-		throw std::runtime_error((char *)glewGetErrorString(err));
-	 }
-
 	//renderer->init();
 
 	//wxCommandEvent event;
@@ -1997,8 +1999,9 @@ GlCanvas::~GlCanvas() {
 
 void GlCanvas::setCurrentGLContext() {
 #ifndef __APPLE__
+	//printf("Set ctx [%p]\n",this->context);
 	if(this->context) {
-		this->SetCurrent(*this->context);
+		wxGLCanvas::SetCurrent(*this->context);
 	}
 #else
 	this->SetCurrent();