Moved Browser.h and Browser.cpp from osgbrowser into osgWidget.

examples/osgbrowser/Browser.cpp

@@ -1,51 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 
- *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
- * (at your option) any later version.  The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * OpenSceneGraph Public License for more details.
-*/
-
-#include "Browser.h"
-
-#include <osg/Notify>
-
-using namespace osgWidget;
-
-
-osg::ref_ptr<BrowserManager>& BrowserManager::instance()
-{
-    static osg::ref_ptr<BrowserManager> s_BrowserManager;
-    return s_BrowserManager;
-}
-
-BrowserManager::BrowserManager()
-{
-    osg::notify(osg::NOTICE)<<"Constructing base BrowserManager"<<std::endl;
-}
-
-BrowserManager::~BrowserManager()
-{
-    osg::notify(osg::NOTICE)<<"Destructing base BrowserManager"<<std::endl;
-}
-
-void BrowserManager::init(const std::string& application)
-{
-    _application = application;
-}
-
-BrowserImage* BrowserManager::createBrowserImage(const std::string& url)
-{
-    return createBrowserImage(url, 1024, 1024);
-}
-
-BrowserImage* BrowserManager::createBrowserImage(const std::string& url, int width, int height)
-{
-    osg::notify(osg::NOTICE)<<"Cannot created browser"<<std::endl;
-    return 0;
-}

examples/osgbrowser/Browser.h

@@ -1,60 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 
- *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
- * (at your option) any later version.  The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef OSGWIDGET_BROWSER
-#define OSGWIDGET_BROWSER
-
-#include <osg/Image>
-#include <osgWidget/Export>
-
-namespace osgWidget {
-
-
-class BrowserImage;
-
-class BrowserManager : public osg::Object
-{
-    public:
-    
-        static osg::ref_ptr<BrowserManager>& instance();
-        
-        virtual void init(const std::string& application);
-
-        virtual BrowserImage* createBrowserImage(const std::string& url);
-        virtual BrowserImage* createBrowserImage(const std::string& url, int width, int height);
-
-    protected:
-
-        BrowserManager();
-        BrowserManager(const BrowserManager& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) {}
-        virtual ~BrowserManager();
-        
-        META_Object(osgWidget,BrowserManager)
-
-        std::string _application;
-};
-
-
-class BrowserImage : public osg::Image
-{
-    public:
-    
-        virtual void navigateTo(const std::string& url) = 0;
-        
-    
-};
-
-
-}
-
-#endif

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)

examples/osgbrowser/UBrowser.h

@@ -14,7 +14,7 @@
 #ifndef UBROWSER_H
 #define UBROWSER_H
 
-#include "Browser.h"
+#include <osgWidget/Browser>
 
 #include <osg/OperationThread>
 

examples/osgwidgetmenu/CMakeLists.txt

@@ -3,5 +3,6 @@
 
 SET(TARGET_SRC osgwidgetmenu.cpp )
 SET(TARGET_ADDED_LIBRARIES osgWidget )
+
 #### end var setup  ###
 SETUP_EXAMPLE(osgwidgetmenu)