From d6ff23d32f56caf24979703e41a48795656bbc00 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 9 May 2002 19:02:35 +0000
Subject: [PATCH] Fix compile problems with osgGA under Windows.

---
 VisualStudio/osgGA/osgGA.dsp             | 8 ++------
 src/osgGA/GUIEventHandler.cpp            | 2 +-
 src/osgGA/KeySwitchCameraManipulator.cpp | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/VisualStudio/osgGA/osgGA.dsp b/VisualStudio/osgGA/osgGA.dsp
index ecb790e6c..0908a7c6b 100755
--- a/VisualStudio/osgGA/osgGA.dsp
+++ b/VisualStudio/osgGA/osgGA.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGUTIL_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGGA_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "OSG_USE_MEMORY_MANAGER" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /D "OSGGA_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "OSG_USE_MEMORY_MANAGER" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -93,10 +93,6 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\src\osgGA\
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\osgGA\CameraManipulator.cpp
 # End Source File
 # Begin Source File
diff --git a/src/osgGA/GUIEventHandler.cpp b/src/osgGA/GUIEventHandler.cpp
index 3e257bce1..962da7607 100644
--- a/src/osgGA/GUIEventHandler.cpp
+++ b/src/osgGA/GUIEventHandler.cpp
@@ -1,6 +1,6 @@
 #include <osgGA/GUIEventHandler>
 
-using osgGA::CompositeGUIEventHandler;
+using namespace osgGA;
 
 bool CompositeGUIEventHandler::handle(const GUIEventAdapter& ea,GUIActionAdapter& aa)
 {
diff --git a/src/osgGA/KeySwitchCameraManipulator.cpp b/src/osgGA/KeySwitchCameraManipulator.cpp
index dab1f5d81..c38865bdb 100644
--- a/src/osgGA/KeySwitchCameraManipulator.cpp
+++ b/src/osgGA/KeySwitchCameraManipulator.cpp
@@ -19,8 +19,8 @@ bool KeySwitchCameraManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapt
 
         KeyManipMap::iterator it=_manips.find(ea.getKey());
         if(it != _manips.end()){
-            osg::notify(osg::INFO)<<"Switching to manipulator: "<<(*it).second.first<<endl;
-            cout<<"***Switching to manipulator: "<<(*it).second.first<<endl;
+            osg::notify(osg::INFO)<<"Switching to manipulator: "<<(*it).second.first<<std::endl;
+            cout<<"***Switching to manipulator: "<<(*it).second.first<<std::endl;
             it->second.second->setNode(_current->getNode());
             it->second.second->setCamera(_current->getCamera());
             it->second.second->init(ea,aa);