jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved some USE_QOPENGLWIDGET defines

Browse source
This commit is contained in:
Marius Kintel 2015-12-02 15:57:19 -05:00
parent e7a4587a7b
commit 7ada64aebb
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/QGLView.cc
View file

@ -51,7 +51,7 @@
#endif
QGLView::QGLView(QWidget *parent) :
#if QT_VERSION >= 0x050400 && defined(USE_QOPENGLWIDGET)
#ifdef USE_QOPENGLWIDGET
QOpenGLWidget(parent)
#else
QGLWidget(parent)
@ -60,7 +60,7 @@ QGLView::QGLView(QWidget *parent) :
init();
}
#ifdef _WIN32
#if defined(_WIN32) && !defined(USE_QOPENGLWIDGET)
static bool running_under_wine = false;
#endif
@ -74,16 +74,15 @@ void QGLView::init()
setMouseTracking(true);
#if !(QT_VERSION >= 0x050400)
#if defined(_WIN32) && !defined(USE_QOPENGLWIDGET)
// see paintGL() + issue160 + wine FAQ
#ifdef _WIN32
#include <windows.h>
HMODULE hntdll = GetModuleHandle(L"ntdll.dll");
if (hntdll)
if ( (void *)GetProcAddress(hntdll, "wine_get_version") )
running_under_wine = true;
#endif
#endif
}
void QGLView::resetView()
@ -169,7 +168,7 @@ void QGLView::paintGL()
statusLabel->setText(QString::fromStdString(nc.statusText()));
}
#ifdef _WIN32
#if defined(_WIN32) && !defined(USE_QOPENGLWIDGET)
if (running_under_wine) swapBuffers();
#endif
}