Changeset 10936

Show
Ignore:
Timestamp:
01/08/10 12:40:43 (4 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:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgWidget/Frame

    r9287 r10936  
    9696 
    9797            virtual void parented  (Window*); 
    98             virtual bool mouseDrag (double, double, WindowManager*); 
     98            virtual bool mouseDrag (double, double, const WindowManager*); 
    9999 
    100100            CornerType getCornerType() const 
     
    129129            virtual void parented   (Window*); 
    130130            virtual void positioned (); 
    131             virtual bool mouseDrag  (double, double, WindowManager*); 
     131            virtual bool mouseDrag  (double, double, const WindowManager*); 
    132132 
    133133            BorderType getBorderType() const 
  • OpenSceneGraph/trunk/src/osgWidget/Frame.cpp

    r9287 r10936  
    5151} 
    5252 
    53 bool Frame::Corner::mouseDrag(double x, double y, WindowManager* wm) 
     53bool Frame::Corner::mouseDrag(double x, double y, const WindowManager* wm) 
    5454{ 
    5555    Frame* parent = dynamic_cast<Frame*>(getParent()); 
     
    138138} 
    139139 
    140 bool Frame::Border::mouseDrag(double x, double y, WindowManager* wm) 
     140bool Frame::Border::mouseDrag(double x, double y, const WindowManager* wm) 
    141141{ 
    142142    Frame* parent = dynamic_cast<Frame*>(getParent());