Changeset 11164 for OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter

Timestamp:

03/05/10 13:55:08 (3 years ago)

Author:

robert

Message:

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

Update wrappers to reflect these changes.

Files:

• OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter (modified) (2 diffs)

OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter

@@ -380 +380 @@
 
         /// 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).
@@ -465 +465 @@
         float _mx;
         float _my;
-        unsigned int _buttonMask;
-        unsigned int _modKeyMask;
+        int _buttonMask;
+        int _modKeyMask;
         MouseYOrientation _mouseYOrientation;