Changeset 12310

Timestamp:

04/26/11 14:07:37 (2 years ago)

Author:

robert

Message:

From Mattias Helsing, "Fixes two of the osgWidget examples that were broken due to changed
virtual function prototypes in osgWidget/EventInterface"

Location:

OpenSceneGraph/trunk/examples

Files:

• osgwidgetaddremove/osgwidgetaddremove.cpp (modified) (2 diffs)
• osgwidgetmenu/osgwidgetmenu.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgwidgetaddremove/osgwidgetaddremove.cpp

@@ -40 +40 @@
     // annoying...
 
-    virtual bool mousePush(double, double, osgWidget::WindowManager*) {
+    virtual bool mousePush(double, double, const osgWidget::WindowManager*) {
         addColor(0.2f, 0.2f, 0.2f, 0.0f);
         
@@ -46 +46 @@
     }
 
-    virtual bool mouseRelease(double, double, osgWidget::WindowManager*) {
+    virtual bool mouseRelease(double, double, const osgWidget::WindowManager*) {
         addColor(-0.2f, -0.2f, -0.2f, 0.0f);
         

OpenSceneGraph/trunk/examples/osgwidgetmenu/osgwidgetmenu.cpp

@@ -28 +28 @@
     }
 
-    bool mousePush(double, double, osgWidget::WindowManager*) {
+    bool mousePush(double, double, const osgWidget::WindowManager*) {
         return true;
     }
 
-    bool mouseEnter(double, double, osgWidget::WindowManager*) {
+    bool mouseEnter(double, double, const osgWidget::WindowManager*) {
         setColor(0.6f, 0.6f, 0.6f, 1.0f);
         
@@ -38 +38 @@
     }
 
-    bool mouseLeave(double, double, osgWidget::WindowManager*) {
+    bool mouseLeave(double, double, const osgWidget::WindowManager*) {
         setColor(0.3f, 0.3f, 0.3f, 1.0f);
         
@@ -83 +83 @@
     }
 
-    bool mousePush(double, double, osgWidget::WindowManager*) {
+    bool mousePush(double, double, const osgWidget::WindowManager*) {
         if(!_window->isVisible()) _window->show();
 
@@ -91 +91 @@
     }
 
-    bool mouseLeave(double, double, osgWidget::WindowManager*) {
+    bool mouseLeave(double, double, const osgWidget::WindowManager*) {
         if(!_window->isVisible()) setColor(0.8f, 0.8f, 0.8f, 0.8f);