diff options
| author | Pietro Gagliardi <[email protected]> | 2014-04-04 19:14:03 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-04-04 19:14:03 -0400 |
| commit | dd4a7b9cbef10d5469aa6660286dcecfde9a6ad2 (patch) | |
| tree | 35f9aaa0aca71ac481b2411aa016b829f2ce941b | |
| parent | 461b0cc023f7297e8cb77e0aa2707cf6e4494e87 (diff) | |
Removed objc_msgSend_rect_uint_uint_bool().
| -rw-r--r-- | bleh_darwin.m | 2 | ||||
| -rw-r--r-- | objc_darwin.go | 6 | ||||
| -rw-r--r-- | objc_darwin.h | 2 | ||||
| -rw-r--r-- | sysdata_darwin.go | 8 |
4 files changed, 6 insertions, 12 deletions
diff --git a/bleh_darwin.m b/bleh_darwin.m index da1eebf..c6f1364 100644 --- a/bleh_darwin.m +++ b/bleh_darwin.m @@ -113,7 +113,7 @@ id objc_msgSend_rect_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int6 return objc_msgSend(obj, sel, OurRect(), b); } -id _objc_msgSend_rect_uint_uint_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, uintptr_t b, uintptr_t c, BOOL d) +id objc_msgSend_rect_uint_uint_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, uintptr_t b, uintptr_t c, BOOL d) { return objc_msgSend(obj, sel, OurRect(), (NSUInteger) b, (NSUInteger) c, d); } diff --git a/objc_darwin.go b/objc_darwin.go index b3cfb9d..6315d62 100644 --- a/objc_darwin.go +++ b/objc_darwin.go @@ -65,9 +65,3 @@ func objc_msgSend_rect(obj C.id, sel C.SEL, x int, y int, w int, h int) C.id { return C._objc_msgSend_rect(obj, sel, C.int64_t(x), C.int64_t(y), C.int64_t(w), C.int64_t(h)) } - -func objc_msgSend_rect_uint_uint_bool(obj C.id, sel C.SEL, x int, y int, w int, h int, b uintptr, c uintptr, d C.BOOL) C.id { - return C._objc_msgSend_rect_uint_uint_bool(obj, sel, - C.int64_t(x), C.int64_t(y), C.int64_t(w), C.int64_t(h), - C.uintptr_t(b), C.uintptr_t(c), d) -} diff --git a/objc_darwin.h b/objc_darwin.h index adadf37..37e8947 100644 --- a/objc_darwin.h +++ b/objc_darwin.h @@ -102,7 +102,7 @@ extern id objc_msgSend_point(id obj, SEL sel, int64_t x, int64_t y); m3(id_id_id, id, id, id) m3(sel_id_bool, SEL, id, BOOL) -extern id _objc_msgSend_rect_uint_uint_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, uintptr_t b, uintptr_t c, BOOL d); +extern id objc_msgSend_rect_uint_uint_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, uintptr_t b, uintptr_t c, BOOL d); m4(id_sel_id_id, id, SEL, id, id) m4(id_id_id_id, id, id, id, id) diff --git a/sysdata_darwin.go b/sysdata_darwin.go index 427f2f1..ce23348 100644 --- a/sysdata_darwin.go +++ b/sysdata_darwin.go @@ -111,11 +111,11 @@ var classTypes = [nctypes]*classData{ // we have to specify a content rect to start; it will be overridden soon though win := objc_alloc(_NSWindow) - win = objc_msgSend_rect_uint_uint_bool(win, + win = C.objc_msgSend_rect_uint_uint_bool(win, _initWithContentRect, - 0, 0, 100, 100, - NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask, - 2, // NSBackingStoreBuffered - the only backing store method that Apple says we should use (the others are legacy) + C.int64_t(0), C.int64_t(0), C.int64_t(100), C.int64_t(100), + C.uintptr_t(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask), + C.uintptr_t(2), // NSBackingStoreBuffered - the only backing store method that Apple says we should use (the others are legacy) C.BOOL(C.YES)) // defer creation of device until we show the window C.objc_msgSend_id(win, _setDelegate, appDelegate) // this is needed for Areas in the window to receive mouse move events |