FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted the usage of OSG_UNUSED and OT_UNUSED as in hindsight these should never have been merged. Adding code to quieten

Browse Source 
inappropriate warnings is a bad programming practice and does not desrve a place in the OSG code base.
This commit is contained in:
Robert Osfield
2013-07-01 08:21:13 +00:00
parent e876e0bad3
commit a64b412885
11 changed files with 15 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgWidget/Input.cpp
View File

@@ -94,8 +94,6 @@ void Input::_calculateSize(const XYCoord& size) {
if(width > getWidth()) setWidth(osg::round(width));
if(height > getHeight()) setHeight(osg::round(height));
#else
OSG_UNUSED(size);
#endif
}
@@ -283,11 +281,11 @@ void Input::positioned()
}
}
bool Input::keyUp(int /*key*/, int /*mask*/, const WindowManager*) {
bool Input::keyUp(int key, int mask, const WindowManager*) {
return false;
}
bool Input::mouseDrag (double x, double /*y*/, const WindowManager*)
bool Input::mouseDrag (double x, double y, const WindowManager*)
{
_mouseClickX += x;
x = _mouseClickX;
@@ -308,7 +306,7 @@ bool Input::mouseDrag (double x, double /*y*/, const WindowManager*)
return true;
}
bool Input::mousePush (double x, double /*y*/, const WindowManager* /*wm*/)
bool Input::mousePush (double x, double y, const WindowManager* wm)
{
double offset = getOrigin().x();
Window* window = getParent();