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

Replaced use of unsigned int/enum mask combinations with int/enum mask combinations to avoid the need for casting enums to unsigned ints,

Browse Source 
and to avoid associated warnings.

Update wrappers to reflect these changes.
This commit is contained in:
Robert Osfield
2010-03-05 12:55:08 +00:00
parent 273420bb1c
commit 86f491e649
16 changed files with 84 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osgGA/GUIEventAdapter
View File

@@ -379,16 +379,16 @@ public:
MouseYOrientation getMouseYOrientation() const { return _mouseYOrientation; }
/// set current mouse button state.
void setButtonMask(unsigned int mask) { _buttonMask = mask; }
void setButtonMask(int mask) { _buttonMask = mask; }
/// get current mouse button state.
unsigned int getButtonMask() const { return _buttonMask; }
int getButtonMask() const { return _buttonMask; }
/// set modifier key mask.
void setModKeyMask(unsigned int mask) { _modKeyMask = mask; }
void setModKeyMask(int mask) { _modKeyMask = mask; }
/// get modifier key mask.
unsigned int getModKeyMask() const { return _modKeyMask; }
int getModKeyMask() const { return _modKeyMask; }
/// set scrolling motion (for EventType::SCROLL).
void setScrollingMotion(ScrollingMotion motion) { _scrolling.motion = motion; }
@@ -464,8 +464,8 @@ public:
float _Ymin,_Ymax;
float _mx;
float _my;
unsigned int _buttonMask;
unsigned int _modKeyMask;
int _buttonMask;
int _modKeyMask;
MouseYOrientation _mouseYOrientation;
struct Scrolling {