Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for g3d viewer to work in wxwidgets 2.9.4

This commit is contained in:
Mark Vejvoda 2013-11-17 07:37:13 +00:00
parent a10041af45
commit ac59cf5ab8
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/g3d_viewer/main.cpp
View File

@ -302,7 +302,7 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
glCanvas = new GlCanvas(this, args);
#if wxCHECK_VERSION(2, 9, 1)
//glCanvas->setCurrentGLContext();
#else
glCanvas->SetCurrent();
#endif
@ -579,7 +579,9 @@ void MainWindow::init() {
void MainWindow::onPaint(wxPaintEvent &event) {
if(!IsShown()) return;
#if wxCHECK_VERSION(2, 9, 1)
#if wxCHECK_VERSION(2, 9, 3)
#elif wxCHECK_VERSION(2, 9, 1)
glCanvas->setCurrentGLContext();
#endif
@ -1984,7 +1986,7 @@ void translateCoords(wxWindow *wnd, int &x, int &y) {
GlCanvas::GlCanvas(MainWindow * mainWindow, int *args)
#if wxCHECK_VERSION(2, 9, 1)
: wxGLCanvas(mainWindow, -1, args, wxDefaultPosition, wxDefaultSize, 0, wxT("GLCanvas")) {
this->context = new wxGLContext(this);
this->context = NULL;
#else
: wxGLCanvas(mainWindow, -1, wxDefaultPosition, wxDefaultSize, 0, wxT("GLCanvas"), args) {
this->context = NULL;
@ -1999,6 +2001,12 @@ GlCanvas::~GlCanvas() {
void GlCanvas::setCurrentGLContext() {
#ifndef __APPLE__
#if wxCHECK_VERSION(2, 9, 1)
if(this->context == NULL) {
this->context = new wxGLContext(this);
}
#endif
//printf("Set ctx [%p]\n",this->context);
if(this->context) {
wxGLCanvas::SetCurrent(*this->context);
@ -2041,13 +2049,11 @@ END_EVENT_TABLE()
// ===============================================
bool App::OnInit() {
//InterpolationData::setEnableCache(false);
SystemFlags::VERBOSE_MODE_ENABLED = false;
//Renderer::windowW = 1920;
//Renderer::windowH = 1440;
//Renderer::windowX= 0;
//Renderer::windowY= 0;
#if defined(wxMAJOR_VERSION) && defined(wxMINOR_VERSION) && defined(wxRELEASE_NUMBER) && defined(wxSUBRELEASE_NUMBER)
printf("Using wxWidgets version [%d.%d.%d.%d]\n",wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER);
#endif
string modelPath="";
string particlePath="";