From b02917e7a2f9282e20685b01245e6daa5916ebb7 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 9 Apr 2003 08:20:08 +0000
Subject: [PATCH] Fixed type of osg::ApplicationUsage::set/getApplictionName(),
 updated demos accordingly.

Made OsgCameraGroup set the _applicationUsage to the
osg::ApplicationUsage::instance() when no ArgumentParser is supplied.

Added export to osgProducer::ViewerEventAdapter.
---
 examples/osgviewer/osgviewer.cpp       | 2 +-
 examples/osgwindows/osgwindows.cpp     | 2 +-
 include/osg/ApplicationUsage           | 4 ++--
 include/osgProducer/ViewerEventHandler | 2 +-
 src/osgProducer/OsgCameraGroup.cpp     | 3 +++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/examples/osgviewer/osgviewer.cpp b/examples/osgviewer/osgviewer.cpp
index 416b75966..92073f9b3 100644
--- a/examples/osgviewer/osgviewer.cpp
+++ b/examples/osgviewer/osgviewer.cpp
@@ -20,7 +20,7 @@ int main( int argc, char **argv )
     osg::ArgumentParser arguments(&argc,argv);
     
     // set up the usage document, in case we need to print out how to use this program.
-    arguments.getApplicationUsage()->setApplicatonName(arguments.getApplicationName());
+    arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName());
     arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the standard OpenSceneGraph example which loads and visualises 3d models.");
     arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
diff --git a/examples/osgwindows/osgwindows.cpp b/examples/osgwindows/osgwindows.cpp
index b5f3dc34a..72782d44d 100644
--- a/examples/osgwindows/osgwindows.cpp
+++ b/examples/osgwindows/osgwindows.cpp
@@ -52,7 +52,7 @@ int main( int argc, char **argv )
     osg::ArgumentParser arguments(&argc,argv);
     
     // set up the usage document, in case we need to print out how to use this program.
-    arguments.getApplicationUsage()->setApplicatonName(arguments.getApplicationName());
+    arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName());
     arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the standard OpenSceneGraph example which loads and visualises 3d models.");
     arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
diff --git a/include/osg/ApplicationUsage b/include/osg/ApplicationUsage
index 2bf232ae9..a6dd48f7c 100644
--- a/include/osg/ApplicationUsage
+++ b/include/osg/ApplicationUsage
@@ -35,8 +35,8 @@ class SG_EXPORT ApplicationUsage
         typedef std::map<std::string,std::string> UsageMap;
         
 
-        void setApplicatonName(const std::string& name) { _applicationName = name; }
-        const std::string& getApplicatonName() const { return _applicationName; }
+        void setApplicationName(const std::string& name) { _applicationName = name; }
+        const std::string& getApplicationName() const { return _applicationName; }
 
         void setDescription(const std::string& desc) { _description = desc; }
         const std::string& getDescription() const { return _description; }
diff --git a/include/osgProducer/ViewerEventHandler b/include/osgProducer/ViewerEventHandler
index de3655e01..7abef6e66 100644
--- a/include/osgProducer/ViewerEventHandler
+++ b/include/osgProducer/ViewerEventHandler
@@ -19,7 +19,7 @@
 
 namespace osgProducer {
 
-class ViewerEventHandler : public osgGA::GUIEventHandler
+class OSGPRODUCER_EXPORT ViewerEventHandler : public osgGA::GUIEventHandler
 {
     public:
     
diff --git a/src/osgProducer/OsgCameraGroup.cpp b/src/osgProducer/OsgCameraGroup.cpp
index e22e64698..683b70364 100644
--- a/src/osgProducer/OsgCameraGroup.cpp
+++ b/src/osgProducer/OsgCameraGroup.cpp
@@ -89,18 +89,21 @@ std::string extractCameraConfigFile(osg::ArgumentParser& arguments)
 OsgCameraGroup::OsgCameraGroup() : Producer::CameraGroup() 
 {
     _init();
+    _applicationUsage = osg::ApplicationUsage::instance();
 }
 
 OsgCameraGroup::OsgCameraGroup(Producer::CameraConfig *cfg):
     Producer::CameraGroup(cfg) 
 {
     _init();
+    _applicationUsage = osg::ApplicationUsage::instance();
 }
 
 OsgCameraGroup::OsgCameraGroup(const std::string& configFile):
     Producer::CameraGroup(findCameraConfigFile(configFile)) 
 {
     _init();
+    _applicationUsage = osg::ApplicationUsage::instance();
 }
 
 OsgCameraGroup::OsgCameraGroup(osg::ArgumentParser& arguments):