From 003329fd1050d23b53c3ff901e98d9eb4a7ab58a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 3 May 2005 10:09:51 +0000
Subject: [PATCH] Updated wrappers

---
 src/osgWrappers/osg/Drawable.cpp    | 2 ++
 src/osgWrappers/osg/NodeVisitor.cpp | 4 ++--
 src/osgWrappers/osg/Program.cpp     | 4 ++--
 src/osgWrappers/osg/Shader.cpp      | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp
index a136c8d47..be4ca7273 100644
--- a/src/osgWrappers/osg/Drawable.cpp
+++ b/src/osgWrappers/osg/Drawable.cpp
@@ -86,9 +86,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable)
 	Method1(void, setUpdateCallback, IN, osg::Drawable::UpdateCallback *, ac);
 	Method0(osg::Drawable::UpdateCallback *, getUpdateCallback);
 	Method0(const osg::Drawable::UpdateCallback *, getUpdateCallback);
+	Method0(bool, requiresUpdateTraversal);
 	Method1(void, setEventCallback, IN, osg::Drawable::EventCallback *, ac);
 	Method0(osg::Drawable::EventCallback *, getEventCallback);
 	Method0(const osg::Drawable::EventCallback *, getEventCallback);
+	Method0(bool, requiresEventTraversal);
 	Method1(void, setCullCallback, IN, osg::Drawable::CullCallback *, cc);
 	Method0(osg::Drawable::CullCallback *, getCullCallback);
 	Method0(const osg::Drawable::CullCallback *, getCullCallback);
diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp
index b137405f4..27b526c38 100644
--- a/src/osgWrappers/osg/NodeVisitor.cpp
+++ b/src/osgWrappers/osg/NodeVisitor.cpp
@@ -16,7 +16,6 @@
 #include <osg/FrameStamp>
 #include <osg/Geode>
 #include <osg/Group>
-#include <osg/Impostor>
 #include <osg/LOD>
 #include <osg/LightSource>
 #include <osg/MatrixTransform>
@@ -26,6 +25,7 @@
 #include <osg/PagedLOD>
 #include <osg/PositionAttitudeTransform>
 #include <osg/Projection>
+#include <osg/ProxyNode>
 #include <osg/Referenced>
 #include <osg/Sequence>
 #include <osg/Switch>
@@ -85,6 +85,7 @@ BEGIN_VALUE_REFLECTOR(osg::NodeVisitor)
 	Method1(void, apply, IN, osg::Geode &, node);
 	Method1(void, apply, IN, osg::Billboard &, node);
 	Method1(void, apply, IN, osg::Group &, node);
+	Method1(void, apply, IN, osg::ProxyNode &, node);
 	Method1(void, apply, IN, osg::Projection &, node);
 	Method1(void, apply, IN, osg::CoordinateSystemNode &, node);
 	Method1(void, apply, IN, osg::ClipNode &, node);
@@ -97,7 +98,6 @@ BEGIN_VALUE_REFLECTOR(osg::NodeVisitor)
 	Method1(void, apply, IN, osg::Sequence &, node);
 	Method1(void, apply, IN, osg::LOD &, node);
 	Method1(void, apply, IN, osg::PagedLOD &, node);
-	Method1(void, apply, IN, osg::Impostor &, node);
 	Method1(void, apply, IN, osg::ClearNode &, node);
 	Method1(void, apply, IN, osg::OccluderNode &, node);
 	Method1(void, setDatabaseRequestHandler, IN, osg::NodeVisitor::DatabaseRequestHandler *, handler);
diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp
index 8a9e58eab..37379f5f1 100644
--- a/src/osgWrappers/osg/Program.cpp
+++ b/src/osgWrappers/osg/Program.cpp
@@ -166,7 +166,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Program)
 	Method2(void, bindAttribLocation, IN, GLuint, index, IN, const char *, name);
 	Method0(const osg::Program::AttribBindingList &, getAttribBindingList);
 	Method0(bool, isFixedFunction);
-	Method2(void, getGlProgramInfoLog, IN, unsigned int, contextID, IN, std::string &, log);
+	Method2(bool, getGlProgramInfoLog, IN, unsigned int, contextID, IN, std::string &, log);
 	Method1(void, setName, IN, const std::string &, name);
 	Method1(void, setName, IN, const char *, name);
 	Method0(const std::string &, getName);
@@ -185,7 +185,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram)
 	Method0(void, linkProgram);
 	Method0(bool, needsLink);
 	Method0(bool, isLinked);
-	Method1(void, getInfoLog, IN, std::string &, infoLog);
+	Method1(bool, getInfoLog, IN, std::string &, infoLog);
 	Method0(void, useProgram);
 	Method1(void, apply, IN, const osg::Uniform &, uniform);
 	Method1(GLint, getUniformLocation, IN, const std::string &, name);
diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp
index daf956c76..ed4c97686 100644
--- a/src/osgWrappers/osg/Shader.cpp
+++ b/src/osgWrappers/osg/Shader.cpp
@@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader)
 	Method0(void, dirtyShader);
 	Method1(void, compileShader, IN, unsigned int, contextID);
 	Method2(void, attachShader, IN, unsigned int, contextID, IN, GLuint, program);
-	Method2(void, getGlShaderInfoLog, IN, unsigned int, contextID, IN, std::string &, log);
+	Method2(bool, getGlShaderInfoLog, IN, unsigned int, contextID, IN, std::string &, log);
 	Method1(void, setName, IN, const std::string &, name);
 	Method1(void, setName, IN, const char *, name);
 	Method0(const std::string &, getName);