From 900ff985a7c1e72eb3aec346be6583a84d1a9daf Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 18 Feb 2010 22:17:50 +0000
Subject: [PATCH] Updated wrappers

---
 .../introspection/OpenThreads/Mutex.cpp       | 22 ++++++++++++++++---
 .../OpenThreads/ReentrantMutex.cpp            | 15 -------------
 .../introspection/osgDB/DatabasePager.cpp     |  5 +++++
 .../introspection/osgViewer/Scene.cpp         |  5 +++++
 .../osgWidget/EventInterface.cpp              | 10 +++++++++
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/osgWrappers/introspection/OpenThreads/Mutex.cpp b/src/osgWrappers/introspection/OpenThreads/Mutex.cpp
index cb46e2576..682b4799f 100644
--- a/src/osgWrappers/introspection/OpenThreads/Mutex.cpp
+++ b/src/osgWrappers/introspection/OpenThreads/Mutex.cpp
@@ -20,11 +20,24 @@
 #undef OUT
 #endif
 
+BEGIN_ENUM_REFLECTOR(OpenThreads::Mutex::MutexType)
+	I_DeclaringFile("OpenThreads/Mutex");
+	I_EnumLabel(OpenThreads::Mutex::MUTEX_NORMAL);
+	I_EnumLabel(OpenThreads::Mutex::MUTEX_RECURSIVE);
+END_REFLECTOR
+
 BEGIN_OBJECT_REFLECTOR(OpenThreads::Mutex)
 	I_DeclaringFile("OpenThreads/Mutex");
-	I_Constructor0(____Mutex,
-	               "Constructor. ",
-	               "");
+	I_ConstructorWithDefaults1(IN, OpenThreads::Mutex::MutexType, type, OpenThreads::Mutex::MUTEX_NORMAL,
+	                           Properties::NON_EXPLICIT,
+	                           ____Mutex__MutexType,
+	                           "Constructor. ",
+	                           "");
+	I_Method0(OpenThreads::Mutex::MutexType, getMutexType,
+	          Properties::NON_VIRTUAL,
+	          __MutexType__getMutexType,
+	          "",
+	          "");
 	I_Method0(int, lock,
 	          Properties::VIRTUAL,
 	          __int__lock,
@@ -40,5 +53,8 @@ BEGIN_OBJECT_REFLECTOR(OpenThreads::Mutex)
 	          __int__trylock,
 	          "Test if mutex can be locked. ",
 	          "0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_SimpleProperty(OpenThreads::Mutex::MutexType, MutexType, 
+	                 __MutexType__getMutexType, 
+	                 0);
 END_REFLECTOR
 
diff --git a/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp b/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp
index 338be1904..465190291 100644
--- a/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp
+++ b/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp
@@ -26,20 +26,5 @@ BEGIN_OBJECT_REFLECTOR(OpenThreads::ReentrantMutex)
 	I_Constructor0(____ReentrantMutex,
 	               "",
 	               "");
-	I_Method0(int, lock,
-	          Properties::VIRTUAL,
-	          __int__lock,
-	          "Lock the mutex. ",
-	          "0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, unlock,
-	          Properties::VIRTUAL,
-	          __int__unlock,
-	          "Unlock the mutex. ",
-	          "0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, trylock,
-	          Properties::VIRTUAL,
-	          __int__trylock,
-	          "Test if mutex can be locked. ",
-	          "0 if normal, -1 if errno set, errno code otherwise.  ");
 END_REFLECTOR
 
diff --git a/src/osgWrappers/introspection/osgDB/DatabasePager.cpp b/src/osgWrappers/introspection/osgDB/DatabasePager.cpp
index 25f47987c..5e5362f78 100644
--- a/src/osgWrappers/introspection/osgDB/DatabasePager.cpp
+++ b/src/osgWrappers/introspection/osgDB/DatabasePager.cpp
@@ -63,6 +63,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
 	               ____DatabasePager__C5_DatabasePager_R1,
 	               "",
 	               "");
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "",
+	          "");
 	I_Method0(osgDB::DatabasePager *, clone,
 	          Properties::VIRTUAL,
 	          __DatabasePager_P1__clone,
diff --git a/src/osgWrappers/introspection/osgViewer/Scene.cpp b/src/osgWrappers/introspection/osgViewer/Scene.cpp
index 4c69f32ca..8bdd9759f 100644
--- a/src/osgWrappers/introspection/osgViewer/Scene.cpp
+++ b/src/osgWrappers/introspection/osgViewer/Scene.cpp
@@ -27,6 +27,11 @@
 BEGIN_OBJECT_REFLECTOR(osgViewer::Scene)
 	I_DeclaringFile("osgViewer/Scene");
 	I_BaseType(osg::Referenced);
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "",
+	          "");
 	I_Method1(void, setSceneData, IN, osg::Node *, node,
 	          Properties::NON_VIRTUAL,
 	          __void__setSceneData__osg_Node_P1,
diff --git a/src/osgWrappers/introspection/osgWidget/EventInterface.cpp b/src/osgWrappers/introspection/osgWidget/EventInterface.cpp
index aa0154074..3f18ef264 100644
--- a/src/osgWrappers/introspection/osgWidget/EventInterface.cpp
+++ b/src/osgWrappers/introspection/osgWidget/EventInterface.cpp
@@ -34,6 +34,11 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Callback)
 	               ____Callback__C5_Callback_R1,
 	               "",
 	               "");
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "",
+	          "");
 	I_ConstructorWithDefaults2(IN, osgWidget::EventType, type, , IN, void *, data, 0,
 	                           ____Callback__EventType__void_P1,
 	                           "",
@@ -67,6 +72,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::CallbackInterface)
 	I_Constructor0(____CallbackInterface,
 	               "",
 	               "");
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "",
+	          "");
 END_REFLECTOR
 
 BEGIN_VALUE_REFLECTOR(osgWidget::Event)