diff options
| -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 ce5f905..da1eebf 100644 --- a/bleh_darwin.m +++ b/bleh_darwin.m @@ -108,7 +108,7 @@ id _objc_msgSend_rect(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t return objc_msgSend(obj, sel, OurRect()); } -id _objc_msgSend_rect_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, BOOL b) +id objc_msgSend_rect_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, BOOL b) { return objc_msgSend(obj, sel, OurRect(), b); } diff --git a/objc_darwin.go b/objc_darwin.go index 9ad554d..b3cfb9d 100644 --- a/objc_darwin.go +++ b/objc_darwin.go @@ -66,12 +66,6 @@ func objc_msgSend_rect(obj C.id, sel C.SEL, x int, y int, w int, h int) C.id { C.int64_t(x), C.int64_t(y), C.int64_t(w), C.int64_t(h)) } -func objc_msgSend_rect_bool(obj C.id, sel C.SEL, x int, y int, w int, h int, b C.BOOL) C.id { - return C._objc_msgSend_rect_bool(obj, sel, - C.int64_t(x), C.int64_t(y), C.int64_t(w), C.int64_t(h), - b) -} - 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), diff --git a/objc_darwin.h b/objc_darwin.h index fadeded..adadf37 100644 --- a/objc_darwin.h +++ b/objc_darwin.h @@ -93,7 +93,7 @@ extern id objc_msgSend_int(id obj, SEL sel, intptr_t a); m1(double, double) m2(id_id, id, id) -extern id _objc_msgSend_rect_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, BOOL b); +extern id objc_msgSend_rect_bool(id obj, SEL sel, int64_t x, int64_t y, int64_t w, int64_t h, BOOL b); extern id objc_msgSend_id_int(id obj, SEL sel, id a, intptr_t b); extern id objc_msgSend_id_uint(id obj, SEL sel, id a, uintptr_t b); m2(id_bool, id, BOOL) diff --git a/sysdata_darwin.go b/sysdata_darwin.go index 1f947f0..427f2f1 100644 --- a/sysdata_darwin.go +++ b/sysdata_darwin.go @@ -176,8 +176,8 @@ var classTypes = [nctypes]*classData{ C.objc_msgSend_bool(combobox, _setUsesDataSource, C.BOOL(C.NO)) } else { combobox = objc_alloc(_NSPopUpButton) - combobox = objc_msgSend_rect_bool(combobox, _initWithFramePullsDown, - 0, 0, 100, 100, + combobox = C.objc_msgSend_rect_bool(combobox, _initWithFramePullsDown, + C.int64_t(0), C.int64_t(0), C.int64_t(100), C.int64_t(100), C.BOOL(C.NO)) } addControl(parentWindow, combobox) @@ -455,8 +455,8 @@ func (s *sysData) setWindowSize(width int, height int) error { uitask <- func() { // we need to get the top left point r := C.objc_msgSend_stret_rect_noargs(s.id, _frame) - objc_msgSend_rect_bool(s.id, _setFrameDisplay, - int(r.x), int(r.y), width, height, + C.objc_msgSend_rect_bool(s.id, _setFrameDisplay, + C.int64_t(r.x), C.int64_t(r.y), C.int64_t(width), C.int64_t(height), C.BOOL(C.YES)) // TODO set to NO to prevent subviews from being redrawn before they are resized? ret <- struct{}{} } |