Changeset 10936

Timestamp:

01/08/10 12:40:43 (3 years ago)

Author:

robert

Message:

From Jean-Sebastien Guay, "was testing an osgWidget-based test app I have and noticed that I couldn't move the windows/frames around on the screen anymore. Turns out that the virtual methods' interface changed in the EventInterface? base class, the third argument to mouseDrag() is now const, but it was not changed in the derived classes, so it still compiled but the derived-class version was not being called because its arguments differed.

Here are the changes that fix it.
"

Location:

OpenSceneGraph/trunk

Files:

• include/osgWidget/Frame (modified) (2 diffs)
• src/osgWidget/Frame.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osgWidget/Frame

@@ -96 +96 @@
 
             virtual void parented  (Window*);
-            virtual bool mouseDrag (double, double, WindowManager*);
+            virtual bool mouseDrag (double, double, const WindowManager*);
 
             CornerType getCornerType() const
@@ -129 +129 @@
             virtual void parented   (Window*);
             virtual void positioned ();
-            virtual bool mouseDrag  (double, double, WindowManager*);
+            virtual bool mouseDrag  (double, double, const WindowManager*);
 
             BorderType getBorderType() const

OpenSceneGraph/trunk/src/osgWidget/Frame.cpp

@@ -51 +51 @@
 }
 
-bool Frame::Corner::mouseDrag(double x, double y, WindowManager* wm)
+bool Frame::Corner::mouseDrag(double x, double y, const WindowManager* wm)
 {
     Frame* parent = dynamic_cast<Frame*>(getParent());
@@ -138 +138 @@
 }
 
-bool Frame::Border::mouseDrag(double x, double y, WindowManager* wm)
+bool Frame::Border::mouseDrag(double x, double y, const WindowManager* wm)
 {
     Frame* parent = dynamic_cast<Frame*>(getParent());