From 1c6565b4f59511e43af6d227b70ddb24127f6cc8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 28 Nov 2006 20:37:27 +0000
Subject: [PATCH] Updated wrappers

---
 src/osgWrappers/osg/View.cpp                  |  2 +-
 src/osgWrappers/osgViewer/CompositeViewer.cpp | 25 ++++++++++---------
 src/osgWrappers/osgViewer/View.cpp            | 12 ++++-----
 src/osgWrappers/osgViewer/Viewer.cpp          |  3 ++-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp
index 44bf7dbb7..61a5d77b6 100644
--- a/src/osgWrappers/osg/View.cpp
+++ b/src/osgWrappers/osg/View.cpp
@@ -24,7 +24,7 @@
 #endif
 
 BEGIN_OBJECT_REFLECTOR(osg::View)
-	I_BaseType(osg::Referenced);
+	I_VirtualBaseType(osg::Referenced);
 	I_Constructor0(____View,
 	               "",
 	               "");
diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp
index 45875a93c..3316f7ea8 100644
--- a/src/osgWrappers/osgViewer/CompositeViewer.cpp
+++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp
@@ -11,6 +11,7 @@
 #include <osgIntrospection/Attributes>
 
 #include <osgViewer/CompositeViewer>
+#include <osgViewer/View>
 
 // Must undefine IN and OUT macros defined in Windows headers
 #ifdef IN
@@ -25,20 +26,20 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer)
 	I_Constructor0(____CompositeViewer,
 	               "",
 	               "");
-	I_Method1(void, addView, IN, osgViewer *, view,
-	          __void__addView__osgViewer_P1,
+	I_Method1(void, addView, IN, osgViewer::View *, view,
+	          __void__addView__osgViewer_View_P1,
 	          "",
 	          "");
-	I_Method1(osgViewer *, getView, IN, unsigned, i,
-	          __osgViewer_P1__getView__unsigned,
+	I_Method1(osgViewer::View *, getView, IN, unsigned, i,
+	          __osgViewer_View_P1__getView__unsigned,
 	          "",
 	          "");
-	I_Method1(const osgViewer *, getView, IN, unsigned, i,
-	          __C5_osgViewer_P1__getView__unsigned,
+	I_Method1(const osgViewer::View *, getView, IN, unsigned, i,
+	          __C5_osgViewer_View_P1__getView__unsigned,
 	          "",
 	          "");
-	I_Method0(void, getNumViews,
-	          __void__getNumViews,
+	I_Method0(unsigned int, getNumViews,
+	          __unsigned_int__getNumViews,
 	          "",
 	          "");
 	I_Method0(void, frame,
@@ -77,11 +78,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer)
 	          __void__init,
 	          "",
 	          "");
-	I_ArrayProperty(osgViewer *, View, 
-	                __osgViewer_P1__getView__unsigned, 
+	I_ArrayProperty(osgViewer::View *, View, 
+	                __osgViewer_View_P1__getView__unsigned, 
 	                0, 
-	                __void__getNumViews, 
-	                __void__addView__osgViewer_P1, 
+	                __unsigned_int__getNumViews, 
+	                __void__addView__osgViewer_View_P1, 
 	                0, 
 	                0);
 END_REFLECTOR
diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp
index 37c67625e..16251bd67 100644
--- a/src/osgWrappers/osgViewer/View.cpp
+++ b/src/osgWrappers/osgViewer/View.cpp
@@ -23,11 +23,11 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, View::EventHandlers);
+TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::View::EventHandlers);
 
-BEGIN_OBJECT_REFLECTOR(View)
+BEGIN_OBJECT_REFLECTOR(osgViewer::View)
 	I_VirtualBaseType(osg::View);
-	I_BaseType(osgViewer::Scene);
+	I_VirtualBaseType(osgViewer::Scene);
 	I_Constructor0(____View,
 	               "",
 	               "");
@@ -59,11 +59,11 @@ BEGIN_OBJECT_REFLECTOR(View)
 	          __void__addEventHandler__osgGA_GUIEventHandler_P1,
 	          "",
 	          "");
-	I_Method0(View::EventHandlers &, getEventHandlers,
+	I_Method0(osgViewer::View::EventHandlers &, getEventHandlers,
 	          __EventHandlers_R1__getEventHandlers,
 	          "",
 	          "");
-	I_Method0(const View::EventHandlers &, getEventHandlers,
+	I_Method0(const osgViewer::View::EventHandlers &, getEventHandlers,
 	          __C5_EventHandlers_R1__getEventHandlers,
 	          "",
 	          "");
@@ -74,7 +74,7 @@ BEGIN_OBJECT_REFLECTOR(View)
 	I_SimpleProperty(osgGA::MatrixManipulator *, CameraManipulator, 
 	                 __osgGA_MatrixManipulator_P1__getCameraManipulator, 
 	                 __void__setCameraManipulator__osgGA_MatrixManipulator_P1);
-	I_SimpleProperty(View::EventHandlers &, EventHandlers, 
+	I_SimpleProperty(osgViewer::View::EventHandlers &, EventHandlers, 
 	                 __EventHandlers_R1__getEventHandlers, 
 	                 0);
 	I_SimpleProperty(osg::Node *, SceneData, 
diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp
index a1bc67903..ebc8bada1 100644
--- a/src/osgWrappers/osgViewer/Viewer.cpp
+++ b/src/osgWrappers/osgViewer/Viewer.cpp
@@ -20,7 +20,8 @@
 #undef OUT
 #endif
 
-BEGIN_VALUE_REFLECTOR(osgViewer::Viewer)
+BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer)
+	I_BaseType(osgViewer::View);
 	I_Constructor0(____Viewer,
 	               "",
 	               "");