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

Merge pull request #118 from LaurensVoerman/Submissions2b

Browse Source 
fix colliding include guards and spurious #define OSGUI_EXPORT
This commit is contained in:
OpenSceneGraph git repository 2016-09-02 17:34:20 +01:00 committed by GitHub
commit def6508308
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgGA/Widget
View File

@ -11,16 +11,14 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGUI_WIDGET
#define OSGUI_WIDGET
#ifndef OSGGA_WIDGET
#define OSGGA_WIDGET
#include <osg/Group>
#include <osg/BoundingBox>
#include <osgGA/Event>
#include <osgGA/EventVisitor>
#define OSGUI_EXPORT
namespace osgGA
{

4
include/osgUI/TabWidget
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGUI_COMBOBOX
#define OSGUI_COMBOBOX
#ifndef OSGUI_TABWIDGET
#define OSGUI_TABWIDGET
#include <osgUI/Popup>
#include <osg/Switch>