FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Win32 Build fixes

Browse Source 
Removed the duplicate constructor and destructor
This commit is contained in:
Robert Osfield 2016-05-16 16:23:21 +01:00
parent a0684bd058
commit 10a89ae0c5
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/osgViewer/GraphicsWindowWin32.cpp
View File

@ -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 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 static std::string osgGraphicsWindowWithoutCursorClass; //!< Name of Win32 window class (without cursor) used by OSG graphics window instances
Win32WindowingSystem() Win32WindowingSystem();
{
getInterface() = this;
}
// Access the Win32 windowing system through this singleton class. // Access the Win32 windowing system through this singleton class.
static osg::observer_ptr<Win32WindowingSystem>& getInterface() static osg::observer_ptr<Win32WindowingSystem>& getInterface()
@ -370,7 +367,7 @@ class Win32WindowingSystem : public osg::GraphicsContext::WindowingSystemInterfa
protected: protected:
virtual ~Win32WindowingSystem() {} virtual ~Win32WindowingSystem();
// Display devices present in the system // Display devices present in the system
typedef std::vector<DISPLAY_DEVICE> DisplayDevices; typedef std::vector<DISPLAY_DEVICE> DisplayDevices;
@ -703,7 +700,9 @@ std::string Win32WindowingSystem::osgGraphicsWindowWithoutCursorClass;
Win32WindowingSystem::Win32WindowingSystem() Win32WindowingSystem::Win32WindowingSystem()
: _windowClassesRegistered(false) : _windowClassesRegistered(false)
{ {
// Detect presence of runtime support for multitouch getInterface() = this;
// Detect presence of runtime support for multitouch
HMODULE hModule = LoadLibrary("user32"); HMODULE hModule = LoadLibrary("user32");
if (hModule) if (hModule)
{ {