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

Moved the REGISTER_WINDOWINGSYSTEMINTERFACE macro into the osgViewer namespace

Browse Source
This commit is contained in:
Robert Osfield 2016-06-02 17:54:24 +01:00
parent 9aef7d2954
commit b1655dd17b
3 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@ -1097,22 +1097,6 @@ public:
}; };
}
#if 1
REGISTER_WINDOWINGSYSTEMINTERFACE(Carbon, CarbonWindowingSystemInterface) REGISTER_WINDOWINGSYSTEMINTERFACE(Carbon, CarbonWindowingSystemInterface)
#else
#ifdef USE_DARWIN_CARBON_IMPLEMENTATION
RegisterWindowingSystemInterfaceProxy<CarbonWindowingSystemInterface> createWindowingSystemInterfaceProxy;
#endif
// declare C entry point for static compilation.
extern "C" void graphicswindow_Carbon(void)
{
osg::GraphicsContext::setWindowingSystemInterface(new osgViewer::CarbonWindowingSystemInterface());
} }
#endif
#endif

12
src/osgViewer/GraphicsWindowCocoa.mm
View File

@ -1827,18 +1827,6 @@ private:
}; };
}
#if 1
REGISTER_WINDOWINGSYSTEMINTERFACE(Cocoa, CocoaWindowingSystemInterface) REGISTER_WINDOWINGSYSTEMINTERFACE(Cocoa, CocoaWindowingSystemInterface)
#else
#ifdef USE_DARWIN_COCOA_IMPLEMENTATION
RegisterWindowingSystemInterfaceProxy<osgViewer::CocoaWindowingSystemInterface> createWindowingSystemInterfaceProxy;
#endif
// declare C entry point for static compilation.
extern "C" void graphicswindow_Cocoa(void)
{
osg::GraphicsContext::setWindowingSystemInterface(new osgViewer::CocoaWindowingSystemInterface());
} }
#endif

13
src/osgViewer/GraphicsWindowIOS.mm
View File

@ -1224,17 +1224,6 @@ public:
} }
}; };
}//end namspace
#if 1
REGISTER_WINDOWINGSYSTEMINTERFACE(IOS, ConcreteIOSWindowingSystemInterface) REGISTER_WINDOWINGSYSTEMINTERFACE(IOS, ConcreteIOSWindowingSystemInterface)
#else
RegisterWindowingSystemInterfaceProxy<osgViewer::ConcreteIOSWindowingSystemInterface> createWindowingSystemInterfaceProxy;
}//end namspace
// declare C entry point for static compilation.
extern "C" void graphicswindow_IOS(void)
{
osg::GraphicsContext::setWindowingSystemInterface(new osgViewer::ConcreteIOSWindowingSystemInterface());
}
#endif