diff options
| -rw-r--r-- | redo/control_darwin.go | 2 | ||||
| -rw-r--r-- | redo/label_darwin.go | 2 | ||||
| -rw-r--r-- | redo/objc_darwin.h | 4 | ||||
| -rw-r--r-- | redo/tab_darwin.go | 2 | ||||
| -rw-r--r-- | redo/xsizing_darwin.m | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/redo/control_darwin.go b/redo/control_darwin.go index faeb899..55e7550 100644 --- a/redo/control_darwin.go +++ b/redo/control_darwin.go @@ -21,7 +21,7 @@ func basesetParent(c controlPrivate, p *controlParent) { } func basepreferredSize(c controlPrivate, d *sizing) (int, int) { - s := C.controlPrefSize(c.id()) + s := C.controlPreferredSize(c.id()) return int(s.width), int(s.height) } diff --git a/redo/label_darwin.go b/redo/label_darwin.go index ab2cbab..d42bd0a 100644 --- a/redo/label_darwin.go +++ b/redo/label_darwin.go @@ -63,7 +63,7 @@ func (l *label) commitResize(c *allocation, d *sizing) { if d.neighborAlign.baseline != 0 { // no adjustment needed if the given control has no baseline // in order for the baseline value to be correct, the label MUST BE AT THE HEIGHT THAT OS X WANTS IT TO BE! // otherwise, the baseline calculation will be relative to the bottom of the control, and everything will be wrong - origsize := C.controlPrefSize(l._id) + origsize := C.controlPreferredSize(l._id) c.height = int(origsize.height) newrect := C.struct_xrect{ x: C.intptr_t(c.x), diff --git a/redo/objc_darwin.h b/redo/objc_darwin.h index 9962c4e..79d1e04 100644 --- a/redo/objc_darwin.h +++ b/redo/objc_darwin.h @@ -83,8 +83,8 @@ struct xalignment { struct xrect rect; intptr_t baseline; }; -extern struct xsize controlPrefSize(id); -extern struct xsize tabPrefSize(id); +extern struct xsize controlPreferredSize(id); +extern struct xsize tabPreferredSize(id); extern struct xalignment alignmentInfo(id, struct xrect); extern struct xrect frame(id); diff --git a/redo/tab_darwin.go b/redo/tab_darwin.go index 25b94d0..ba74f1f 100644 --- a/redo/tab_darwin.go +++ b/redo/tab_darwin.go @@ -41,7 +41,7 @@ func (t *tab) allocate(x int, y int, width int, height int, d *sizing) []*alloca } func (t *tab) preferredSize(d *sizing) (width, height int) { - s := C.tabPrefSize(t._id) + s := C.tabPreferredSize(t._id) return int(s.width), int(s.height) } diff --git a/redo/xsizing_darwin.m b/redo/xsizing_darwin.m index 6b37378..84d83f2 100644 --- a/redo/xsizing_darwin.m +++ b/redo/xsizing_darwin.m @@ -11,7 +11,7 @@ // TODO merge into control_darwin.m or sizing_darwin.m? really need to figure out what to do about the Go-side container struct... // also good for NSTableView (TODO might not do what we want) and NSProgressIndicator -struct xsize controlPrefSize(id control) +struct xsize controlPreferredSize(id control) { NSControl *c; NSRect r; @@ -25,7 +25,7 @@ struct xsize controlPrefSize(id control) return s; } -struct xsize tabPrefSize(id control) +struct xsize tabPreferredSize(id control) { NSTabView *tv; NSSize s; |