yuqei/core-foundation-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge issue

Browse Source
This commit is contained in:
David Partouche
2014-11-26 14:50:52 +01:00
parent 43783e50fc
commit b43d03fb9a
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/appkit.rs
+28 -28
View File
@@ -252,34 +252,34 @@ pub enum NSEventType {
#[repr(u64)]
pub enum NSEventMask {
NSLeftMouseDownMask = 1 << NSEventType::NSLeftMouseDown as uint,
NSLeftMouseUpMask = 1 << NSEventType::NSLeftMouseUp as uint,
NSRightMouseDownMask = 1 << NSEventType::NSRightMouseDown as uint,
NSRightMouseUpMask = 1 << NSEventType::NSRightMouseUp as uint,
NSMouseMovedMask = 1 << NSEventType::NSMouseMoved as uint,
NSLeftMouseDraggedMask = 1 << NSEventType::NSLeftMouseDragged as uint,
NSRightMouseDraggedMask = 1 << NSEventType::NSRightMouseDragged as uint,
NSMouseEnteredMask = 1 << NSEventType::NSMouseEntered as uint,
NSMouseExitedMask = 1 << NSEventType::NSMouseExited as uint,
NSKeyDownMask = 1 << NSEventType::NSKeyDown as uint,
NSKeyUpMask = 1 << NSEventType::NSKeyUp as uint,
NSFlagsChangedMask = 1 << NSEventType::NSFlagsChanged as uint,
NSAppKitDefinedMask = 1 << NSEventType::NSAppKitDefined as uint,
NSSystemDefinedMask = 1 << NSEventType::NSSystemDefined as uint,
NSAPplicationDefinedMask = 1 << NSEventType::NSApplicationDefined as uint,
NSPeriodicMask = 1 << NSEventType::NSPeriodic as uint,
NSCursorUpdateMask = 1 << NSEventType::NSCursorUpdate as uint,
NSScrollWheelMask = 1 << NSEventType::NSScrollWheel as uint,
NSTabletPointMask = 1 << NSEventType::NSTabletPoint as uint,
NSTabletProximityMask = 1 << NSEventType::NSTabletProximity as uint,
NSOtherMouseDownMask = 1 << NSEventType::NSOtherMouseDown as uint,
NSOtherMouseUpMask = 1 << NSEventType::NSOtherMouseUp as uint,
NSOtherMouseDraggedMask = 1 << NSEventType::NSOtherMouseDragged as uint,
NSEventMaskgesture = 1 << NSEventType::NSEventTypeGesture as uint,
NSEventMaskSwipe = 1 << NSEventType::NSEventTypeSwipe as uint,
NSEventMaskRotate = 1 << NSEventType::NSEventTypeRotate as uint,
NSEventMaskBeginGesture = 1 << NSEventType::NSEventTypeBeginGesture as uint,
NSEventMaskEndGesture = 1 << NSEventType::NSEventTypeEndGesture as uint,
NSLeftMouseDownMask = 1 << NSLeftMouseDown as uint,
NSLeftMouseUpMask = 1 << NSLeftMouseUp as uint,
NSRightMouseDownMask = 1 << NSRightMouseDown as uint,
NSRightMouseUpMask = 1 << NSRightMouseUp as uint,
NSMouseMovedMask = 1 << NSMouseMoved as uint,
NSLeftMouseDraggedMask = 1 << NSLeftMouseDragged as uint,
NSRightMouseDraggedMask = 1 << NSRightMouseDragged as uint,
NSMouseEnteredMask = 1 << NSMouseEntered as uint,
NSMouseExitedMask = 1 << NSMouseExited as uint,
NSKeyDownMask = 1 << NSKeyDown as uint,
NSKeyUpMask = 1 << NSKeyUp as uint,
NSFlagsChangedMask = 1 << NSFlagsChanged as uint,
NSAppKitDefinedMask = 1 << NSAppKitDefined as uint,
NSSystemDefinedMask = 1 << NSSystemDefined as uint,
NSAPplicationDefinedMask = 1 << NSApplicationDefined as uint,
NSPeriodicMask = 1 << NSPeriodic as uint,
NSCursorUpdateMask = 1 << NSCursorUpdate as uint,
NSScrollWheelMask = 1 << NSScrollWheel as uint,
NSTabletPointMask = 1 << NSTabletPoint as uint,
NSTabletProximityMask = 1 << NSTabletProximity as uint,
NSOtherMouseDownMask = 1 << NSOtherMouseDown as uint,
NSOtherMouseUpMask = 1 << NSOtherMouseUp as uint,
NSOtherMouseDraggedMask = 1 << NSOtherMouseDragged as uint,
NSEventMaskgesture = 1 << NSEventTypeGesture as uint,
NSEventMaskSwipe = 1 << NSEventTypeSwipe as uint,
NSEventMaskRotate = 1 << NSEventTypeRotate as uint,
NSEventMaskBeginGesture = 1 << NSEventTypeBeginGesture as uint,
NSEventMaskEndGesture = 1 << NSEventTypeEndGesture as uint,
NSAnyEventMask = 0xffffffff,
}