From 5288263528e98f32efb44f22a1ea2e871b50ff6d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 19 Nov 2008 17:16:29 +0000
Subject: [PATCH] Moved Browser.h and Browser.cpp from osgbrowser into
 osgWidget.

---
 examples/osgbrowser/CMakeLists.txt                         | 5 ++---
 examples/osgbrowser/UBrowser.h                             | 2 +-
 examples/osgwidgetmenu/CMakeLists.txt                      | 1 +
 examples/osgbrowser/Browser.h => include/osgWidget/Browser | 0
 {examples/osgbrowser => src/osgWidget}/Browser.cpp         | 2 +-
 src/osgWidget/CMakeLists.txt                               | 2 ++
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename examples/osgbrowser/Browser.h => include/osgWidget/Browser (100%)
 rename {examples/osgbrowser => src/osgWidget}/Browser.cpp (98%)

diff --git a/examples/osgbrowser/CMakeLists.txt b/examples/osgbrowser/CMakeLists.txt
index 8d0ff84ad..3cf687594 100644
--- a/examples/osgbrowser/CMakeLists.txt
+++ b/examples/osgbrowser/CMakeLists.txt
@@ -3,7 +3,6 @@ SET(TARGET_SRC
     llembeddedbrowserwindow.cpp
     llmozlib2.cpp
     nsProfileDirServiceProvider.cpp
-    Browser.cpp
     UBrowser.cpp
     osgbrowser.cpp
     ReaderWriterUBrowser.cpp
@@ -16,11 +15,11 @@ SET(TARGET_H
     nsProfileDirServiceProvider.h
     nsProfileLock.h
     nsProfileStringTypes.h
-    Browser.h
     UBrowser.h
 )
 
 ADD_DEFINITIONS(-DMOZILLA_INTERNAL_API)
+ADD_DEFINITIONS(-DXUL_DIR=${XUL_DIR})
 
 SET(ALL_REQUIRED_XUL_INCLUDE_DIRS
     ${XUL_INCLUDE_DIRS} 
@@ -61,7 +60,7 @@ ELSE(WIN32 OR APPLE)
 
 ENDIF(WIN32 OR APPLE)
 
-ADD_DEFINITIONS(-DXUL_DIR=${XUL_DIR})
+SET(TARGET_ADDED_LIBRARIES osgWidget )
 
 #### end var setup  ###
 SETUP_EXAMPLE(osgbrowser)
diff --git a/examples/osgbrowser/UBrowser.h b/examples/osgbrowser/UBrowser.h
index e18dba8a0..e915d55b4 100644
--- a/examples/osgbrowser/UBrowser.h
+++ b/examples/osgbrowser/UBrowser.h
@@ -14,7 +14,7 @@
 #ifndef UBROWSER_H
 #define UBROWSER_H
 
-#include "Browser.h"
+#include <osgWidget/Browser>
 
 #include <osg/OperationThread>
 
diff --git a/examples/osgwidgetmenu/CMakeLists.txt b/examples/osgwidgetmenu/CMakeLists.txt
index dc75087ec..fee15155e 100644
--- a/examples/osgwidgetmenu/CMakeLists.txt
+++ b/examples/osgwidgetmenu/CMakeLists.txt
@@ -3,5 +3,6 @@
 
 SET(TARGET_SRC osgwidgetmenu.cpp )
 SET(TARGET_ADDED_LIBRARIES osgWidget )
+
 #### end var setup  ###
 SETUP_EXAMPLE(osgwidgetmenu)
diff --git a/examples/osgbrowser/Browser.h b/include/osgWidget/Browser
similarity index 100%
rename from examples/osgbrowser/Browser.h
rename to include/osgWidget/Browser
diff --git a/examples/osgbrowser/Browser.cpp b/src/osgWidget/Browser.cpp
similarity index 98%
rename from examples/osgbrowser/Browser.cpp
rename to src/osgWidget/Browser.cpp
index 709f5d8dd..03eab5eb2 100644
--- a/examples/osgbrowser/Browser.cpp
+++ b/src/osgWidget/Browser.cpp
@@ -11,7 +11,7 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#include "Browser.h"
+#include <osgWidget/Browser>
 
 #include <osg/Notify>
 
diff --git a/src/osgWidget/CMakeLists.txt b/src/osgWidget/CMakeLists.txt
index e3929da68..34b6da365 100644
--- a/src/osgWidget/CMakeLists.txt
+++ b/src/osgWidget/CMakeLists.txt
@@ -9,6 +9,7 @@ SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Export
     ${HEADER_PATH}/Box
+    ${HEADER_PATH}/Browser
     ${HEADER_PATH}/Canvas
     ${HEADER_PATH}/EventInterface
     ${HEADER_PATH}/Frame
@@ -35,6 +36,7 @@ ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
     ${LIB_PUBLIC_HEADERS}
     Box.cpp
+    Browser.cpp
     Canvas.cpp
     CMakeLists.txt
     Frame.cpp