Show
Ignore:
Timestamp:
03/05/10 13:55:08 (5 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter

    r10211 r11164  
    380380 
    381381        /// set current mouse button state. 
    382         void setButtonMask(unsigned int mask) { _buttonMask = mask; } 
     382        void setButtonMask(int mask) { _buttonMask = mask; } 
    383383 
    384384        /// get current mouse button state. 
    385         unsigned int getButtonMask() const { return _buttonMask; } 
     385        int getButtonMask() const { return _buttonMask; } 
    386386 
    387387        /// set modifier key mask. 
    388         void setModKeyMask(unsigned int mask) { _modKeyMask = mask; } 
     388        void setModKeyMask(int mask) { _modKeyMask = mask; } 
    389389 
    390390        /// get modifier key mask. 
    391         unsigned int getModKeyMask() const { return _modKeyMask; } 
     391        int getModKeyMask() const { return _modKeyMask; } 
    392392 
    393393        /// set scrolling motion (for EventType::SCROLL). 
     
    465465        float _mx; 
    466466        float _my; 
    467         unsigned int _buttonMask; 
    468         unsigned int _modKeyMask; 
     467        int _buttonMask; 
     468        int _modKeyMask; 
    469469        MouseYOrientation _mouseYOrientation; 
    470470