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

try to fix wx 2.8

Browse Source
This commit is contained in:
titiger
2016-01-23 11:42:44 +01:00
parent 06cc22fd8f
commit c9400cc3b1
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/g3d_viewer/main.cpp
View File

@@ -304,10 +304,12 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
isControlKeyPressed = false;
initGlCanvas();
#if wxCHECK_VERSION(2, 9, 1)
#else
if(glCanvas) glCanvas->SetCurrent();
glCanvas->SetCurrent();
#endif
unitPath = unitToLoad;
@@ -477,8 +479,7 @@ void MainWindow::setupStartupSettings() {
//printf("In setupStartupSettings #1\n");
if(glCanvas == NULL) {
int args[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_MIN_ALPHA, 8 }; // to prevent flicker
glCanvas = new GlCanvas(this, args);
initGlCanvas();
#if wxCHECK_VERSION(2, 9, 1)
@@ -576,6 +577,13 @@ MainWindow::~MainWindow(){
}
void MainWindow::initGlCanvas(){
if(glCanvas == NULL) {
int args[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_MIN_ALPHA, 8 }; // to prevent flicker
glCanvas = new GlCanvas(this, args);
}
}
void MainWindow::init() {
#if wxCHECK_VERSION(2, 9, 3)
@@ -583,7 +591,7 @@ void MainWindow::init() {
#elif wxCHECK_VERSION(2, 9, 1)
#else
if(glCanvas) glCanvas->SetCurrent();
glCanvas->SetCurrent();
//printf("setcurrent #2\n");
#endif
}

1
source/g3d_viewer/main.h
View File

@@ -125,6 +125,7 @@ private:
bool startupSettingsInited;
void initGlCanvas();
void loadUnit(string path, string skillName);
void loadModel(string path);
void loadParticle(string path);