Changeset 9289 for OpenSceneGraph/trunk/examples/osgwidgetscrolled/osgwidgetscrolled.cpp

Timestamp:

11/28/08 15:36:39 (4 years ago)

Author:

robert

Message:

From Jeremy Moles, updates to osgwidget examples.

Merged by Robert Osfield from OpenSceneGraph-osgWidget-dev

Files:

• OpenSceneGraph/trunk/examples/osgwidgetscrolled/osgwidgetscrolled.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgwidgetscrolled/osgwidgetscrolled.cpp

@@ -1 +1 @@
 // -*-c++-*- osgWidget - Code by: Jeremy Moles (cubicool) 2007-2008
 // $Id: osgwidgetframe.cpp 34 2008-04-07 03:12:41Z cubicool $
+
+#include <osgDB/ReadFile>
 
 #include <osgWidget/Util>
@@ -85 +87 @@
         MASK_2D,
         osgWidget::WindowManager::WM_PICK_DEBUG
+        //osgWidget::WindowManager::WM_NO_INVERT_Y
     );
     
-    osgWidget::Frame* frame = osgWidget::Frame::createSimpleFrameWithSingleTexture(
+    osgWidget::Frame* frame = osgWidget::Frame::createSimpleFrameFromTheme(
         "frame",
-        "osgWidget/theme-2.png",
-        64.0f,
-        64.0f,
-        16.0f,
-        16.0f,
-        100.0f,
-        100.0f
+        osgDB::readImageFile("osgWidget/theme.png"),
+        40.0f,
+        40.0f,
+        osgWidget::Frame::FRAME_ALL
     );
 
@@ -123 +123 @@
     box->setEventMask(osgWidget::EVENT_NONE);
 
-    frame->getEmbeddedWindow()->setWindow(box);
+    //frame->getEmbeddedWindow()->setWindow(box);
+    frame->setWindow(box);
     frame->getEmbeddedWindow()->setColor(1.0f, 1.0f, 1.0f, 1.0f);
     frame->resize(300.0f, 300.0f);
-    frame->addCallback(osgWidget::Callback(&scrollWindow, osgWidget::EVENT_MOUSE_SCROLL));
-    frame->addCallback(osgWidget::Callback(&changeTheme, osgWidget::EVENT_KEY_DOWN));
+    frame->addCallback(new osgWidget::Callback(&scrollWindow, osgWidget::EVENT_MOUSE_SCROLL));
+    frame->addCallback(new osgWidget::Callback(&changeTheme, osgWidget::EVENT_KEY_DOWN));
 
     wm->addChild(frame);