Changeset 11164 for OpenSceneGraph/trunk/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp

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/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp

@@ -418 +418 @@
                   "get mouse-Y orientation (mouse-Y increases upwards or downwards). ",
                   "");
-        I_Method1(void, setButtonMask, IN, unsigned int, mask,
-                  Properties::NON_VIRTUAL,
-                  __void__setButtonMask__unsigned_int,
+        I_Method1(void, setButtonMask, IN, int, mask,
+                  Properties::NON_VIRTUAL,
+                  __void__setButtonMask__int,
                   "set current mouse button state. ",
                   "");
-        I_Method0(unsigned int, getButtonMask,
-                  Properties::NON_VIRTUAL,
-                  __unsigned_int__getButtonMask,
+        I_Method0(int, getButtonMask,
+                  Properties::NON_VIRTUAL,
+                  __int__getButtonMask,
                   "get current mouse button state. ",
                   "");
-        I_Method1(void, setModKeyMask, IN, unsigned int, mask,
-                  Properties::NON_VIRTUAL,
-                  __void__setModKeyMask__unsigned_int,
+        I_Method1(void, setModKeyMask, IN, int, mask,
+                  Properties::NON_VIRTUAL,
+                  __void__setModKeyMask__int,
                   "set modifier key mask. ",
                   "");
-        I_Method0(unsigned int, getModKeyMask,
-                  Properties::NON_VIRTUAL,
-                  __unsigned_int__getModKeyMask,
+        I_Method0(int, getModKeyMask,
+                  Properties::NON_VIRTUAL,
+                  __int__getModKeyMask,
                   "get modifier key mask. ",
                   "");
@@ -525 +525 @@
                          __int__getButton, 
                          __void__setButton__int);
-        I_SimpleProperty(unsigned int, ButtonMask, 
-                         __unsigned_int__getButtonMask, 
-                         __void__setButtonMask__unsigned_int);
+        I_SimpleProperty(int, ButtonMask, 
+                         __int__getButtonMask, 
+                         __void__setButtonMask__int);
         I_SimpleProperty(osgGA::GUIEventAdapter::EventType, EventType, 
                          __EventType__getEventType, 
@@ -540 +540 @@
                          __int__getKey, 
                          __void__setKey__int);
-        I_SimpleProperty(unsigned int, ModKeyMask, 
-                         __unsigned_int__getModKeyMask, 
-                         __void__setModKeyMask__unsigned_int);
+        I_SimpleProperty(int, ModKeyMask, 
+                         __int__getModKeyMask, 
+                         __void__setModKeyMask__int);
         I_SimpleProperty(osgGA::GUIEventAdapter::MouseYOrientation, MouseYOrientation, 
                          __MouseYOrientation__getMouseYOrientation,