fix colliding include guards and spurious #define OSGUI_EXPORT

8 years ago · ca877a8424
parent 2bdf56cb4b
commit ca877a8424
2 changed files with 4 additions and 6 deletions
--- a/include/osgGA/Widget
+++ b/include/osgGA/Widget
@ -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
 {

--- a/include/osgUI/TabWidget
+++ b/include/osgUI/TabWidget
@ -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>