From b4ffb67c03d34d139fef5995ce2e0031e8136141 Mon Sep 17 00:00:00 2001
From: Titus Tscharntke <titi_ger@users.sourceforge.net>
Date: Mon, 1 Mar 2010 22:37:35 +0000
Subject: [PATCH] stop editor flickering in linux

---
 source/glest_map_editor/main.cpp | 8 ++++----
 source/glest_map_editor/main.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp
index 335c3c6c4..7a2eb5a1a 100644
--- a/source/glest_map_editor/main.cpp
+++ b/source/glest_map_editor/main.cpp
@@ -45,7 +45,8 @@ MainWindow::MainWindow():
 
 	
 	//gl canvas
-	glCanvas = new GlCanvas(this);
+	int args[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER};
+	glCanvas = new GlCanvas(this,args);
 
 	//menus
 	menuBar= new wxMenuBar();
@@ -203,7 +204,6 @@ void MainWindow::onMouseMove(wxMouseEvent &event){
 
 void MainWindow::onPaint(wxPaintEvent &event){
 	program->renderMap(GetClientSize().x, GetClientSize().y);
-	
 	glCanvas->SwapBuffers();
 }
 
@@ -508,8 +508,8 @@ END_EVENT_TABLE()
 //	class GlCanvas
 // =====================================================
 
-GlCanvas::GlCanvas(MainWindow *	mainWindow):
-	wxGLCanvas(mainWindow, -1, wxDefaultPosition)
+GlCanvas::GlCanvas(MainWindow *	mainWindow, int* args):
+	wxGLCanvas(mainWindow, -1, wxDefaultPosition,wxDefaultSize,0,wxT("GLCanvas"),args)
 {
 	this->mainWindow = mainWindow;
 }
diff --git a/source/glest_map_editor/main.h b/source/glest_map_editor/main.h
index 681d83dd7..087027327 100644
--- a/source/glest_map_editor/main.h
+++ b/source/glest_map_editor/main.h
@@ -150,7 +150,7 @@ private:
 	DECLARE_EVENT_TABLE()
 
 public:
-	GlCanvas(MainWindow *mainWindow);
+	GlCanvas(MainWindow *mainWindow,int* args);
 
 	void onMouseDown(wxMouseEvent &event);
 	void onMouseMove(wxMouseEvent &event);