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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Rafael Barbosa
2015-02-07 22:35:51 +00:00
parent 7f9b8db9ae c59c4cb750
commit ce298a98ec
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1
View File
@@ -10,3 +10,4 @@ crate-type = ["rlib"]
[dependencies]
bitflags = "0.1"
libc = "*"
src/appkit.rs
+8 -8
View File
@@ -1033,7 +1033,7 @@ impl NSWindow for id {
}
unsafe fn mouseLocationOutsideOfEventStream(self) -> NSPoint {
msg_send_stret()(self, selector("mouseLocationOutsideOfEventStream"))
msg_send()(self, selector("mouseLocationOutsideOfEventStream"))
}
unsafe fn setAcceptsMouseMovedEvents_(self, acceptMouseMovedEvents: BOOL) {
@@ -1635,7 +1635,7 @@ pub trait NSEvent {
unsafe fn modifierFlags(self) -> NSEventModifierFlags;
unsafe fn timestamp(self) -> NSTimeInterval;
// NOTE: renamed from `- type` due to Rust keyword collision
unsafe fn event_type(self) -> NSEventType;
unsafe fn eventType(self) -> NSEventType;
unsafe fn window(self) -> id /* (NSWindow *) */;
unsafe fn windowNumber(self) -> NSInteger;
unsafe fn eventRef(self) -> *const libc::c_void;
@@ -1847,7 +1847,7 @@ impl NSEvent for id {
}
unsafe fn locationInWindow(self) -> NSPoint {
msg_send_stret()(self, selector("locationInWindow"))
msg_send()(self, selector("locationInWindow"))
}
unsafe fn modifierFlags(self) -> NSEventModifierFlags {
@@ -1859,8 +1859,8 @@ impl NSEvent for id {
}
// NOTE: renamed from `- type` due to Rust keyword collision
unsafe fn event_type(self) -> NSEventType {
msg_send()(self, selector("event_type"))
unsafe fn eventType(self) -> NSEventType {
msg_send()(self, selector("type"))
}
unsafe fn window(self) -> id /* (NSWindow *) */ {
@@ -1918,7 +1918,7 @@ impl NSEvent for id {
}
unsafe fn mouseLocation(_: Self) -> NSPoint {
msg_send_stret()(class("NSEvent"), selector("mouseLocation"))
msg_send()(class("NSEvent"), selector("mouseLocation"))
}
unsafe fn buttonNumber(self) -> NSInteger {
@@ -2056,7 +2056,7 @@ impl NSEvent for id {
}
unsafe fn tilt(self) -> NSPoint {
msg_send_stret()(self, selector("tilt"))
msg_send()(self, selector("tilt"))
}
unsafe fn vendorDefined(self) -> id {
@@ -2464,4 +2464,4 @@ impl NSTabViewItem for id {
unsafe fn setTooltip_(self,toolTip:id){
msg_send()(self,selector("setTooltip:"),toolTip)
}
}
}