fix build failure on Windows due to conflicting define with Win32 API

This commit is contained in:
wmayer
2017-09-20 15:58:09 +02:00
parent 2e32324007
commit 4737b2bcbc
4 changed files with 7 additions and 3 deletions

View File

@@ -48,7 +48,7 @@ using namespace SIM::Coin3D::Quarter;
devices.
*/
InputDevice::InputDevice(void)
InputDevice::InputDevice(void) : quarter(nullptr)
{
this->mousepos = SbVec2s(0, 0);
}

View File

@@ -55,6 +55,9 @@
#include <Inventor/SbVec2s.h>
#include <Inventor/events/SoEvents.h>
#include <Inventor/errors/SoDebugError.h>
#if QT_VERSION >= 0x050000
#include <Quarter/QuarterWidget.h>
#endif
namespace SIM { namespace Coin3D { namespace Quarter {

View File

@@ -835,7 +835,7 @@ void QuarterWidget::resizeEvent(QResizeEvent* event)
*/
void QuarterWidget::paintEvent(QPaintEvent* event)
{
if(updateDevicePixelRatio()) {
if (updateDevicePixelRatio()) {
qreal dev_pix_ratio = devicePixelRatio();
int width = static_cast<int>(dev_pix_ratio * this->width());
int height = static_cast<int>(dev_pix_ratio * this->height());

View File

@@ -35,7 +35,6 @@
#include <Quarter/Basic.h>
#include <Inventor/SbVec2s.h>
#include <Quarter/QuarterWidget.h>
class QEvent;
class SoEvent;
@@ -43,6 +42,8 @@ class QInputEvent;
namespace SIM { namespace Coin3D { namespace Quarter {
class QuarterWidget;
class QUARTER_DLL_API InputDevice {
public:
InputDevice(QuarterWidget * quarter);