mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-23 08:22:50 +02:00
Code Issues Projects Releases Wiki Activity

- try to fix wx 2.8

Browse Source
This commit is contained in:
SoftCoder
2016-01-22 18:05:46 -08:00
parent 325920400e
commit 4da1425cbc
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

Submodule data/glest_game updated: c256b69196...a1e6be2182

9
source/g3d_viewer/main.cpp
View File

@@ -307,7 +307,7 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
#if wxCHECK_VERSION(2, 9, 1) #if wxCHECK_VERSION(2, 9, 1)
#else #else
glCanvas->SetCurrent(); if(glCanvas) glCanvas->SetCurrent();
#endif #endif
unitPath = unitToLoad; unitPath = unitToLoad;
@@ -479,6 +479,13 @@ void MainWindow::setupStartupSettings() {
if(glCanvas == NULL) { if(glCanvas == NULL) {
int args[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_MIN_ALPHA, 8 }; // to prevent flicker int args[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_MIN_ALPHA, 8 }; // to prevent flicker
glCanvas = new GlCanvas(this, args); glCanvas = new GlCanvas(this, args);
#if wxCHECK_VERSION(2, 9, 1)
#else
glCanvas->SetCurrent();
#endif
} }
glCanvas->setCurrentGLContext(); glCanvas->setCurrentGLContext();
//printf("In setupStartupSettings #2\n"); //printf("In setupStartupSettings #2\n");