From 10a89ae0c5fa0788303464369aea1c561a39c02d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 16 May 2016 16:23:21 +0100 Subject: [PATCH] Win32 Build fixes Removed the duplicate constructor and destructor --- src/osgViewer/GraphicsWindowWin32.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp index 862b8b6e4..b9431c256 100644 --- a/src/osgViewer/GraphicsWindowWin32.cpp +++ b/src/osgViewer/GraphicsWindowWin32.cpp @@ -317,10 +317,7 @@ class Win32WindowingSystem : public osg::GraphicsContext::WindowingSystemInterfa static std::string osgGraphicsWindowWithCursorClass; //!< Name of Win32 window class (with cursor) used by OSG graphics window instances static std::string osgGraphicsWindowWithoutCursorClass; //!< Name of Win32 window class (without cursor) used by OSG graphics window instances - Win32WindowingSystem() - { - getInterface() = this; - } + Win32WindowingSystem(); // Access the Win32 windowing system through this singleton class. static osg::observer_ptr& getInterface() @@ -370,7 +367,7 @@ class Win32WindowingSystem : public osg::GraphicsContext::WindowingSystemInterfa protected: - virtual ~Win32WindowingSystem() {} + virtual ~Win32WindowingSystem(); // Display devices present in the system typedef std::vector DisplayDevices; @@ -703,7 +700,9 @@ std::string Win32WindowingSystem::osgGraphicsWindowWithoutCursorClass; Win32WindowingSystem::Win32WindowingSystem() : _windowClassesRegistered(false) { - // Detect presence of runtime support for multitouch + getInterface() = this; + + // Detect presence of runtime support for multitouch HMODULE hModule = LoadLibrary("user32"); if (hModule) {