diff options
| author | Pietro Gagliardi <[email protected]> | 2014-08-11 12:49:39 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-08-11 12:49:39 -0400 |
| commit | 219132f2f18d3b77d472e218bbcd39eb059bb90d (patch) | |
| tree | 33bf8777be0b9f5e55204a7acf1bf9d153c28386 | |
| parent | 55f25afb49995ae799d9a093ed4f14142d4a8691 (diff) | |
Renamed Mac OS X's container's view field to id to be in sync with the other Mac OS X data structures.
| -rw-r--r-- | redo/container_darwin.go | 7 | ||||
| -rw-r--r-- | redo/tab_darwin.go | 2 | ||||
| -rw-r--r-- | redo/window_darwin.go | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/redo/container_darwin.go b/redo/container_darwin.go index 96aca31..a1096f1 100644 --- a/redo/container_darwin.go +++ b/redo/container_darwin.go @@ -11,8 +11,7 @@ import "C" type container struct { containerbase - // TODO rename to id - view C.id + id C.id } type sizing struct { @@ -27,9 +26,9 @@ type sizing struct { func newContainer(child Control) *container { c := new(container) - c.view = C.newContainerView(unsafe.Pointer(c)) + c.id = C.newContainerView(unsafe.Pointer(c)) c.child = child - c.child.setParent(&controlParent{c.view}) + c.child.setParent(&controlParent{c.id}) return c } diff --git a/redo/tab_darwin.go b/redo/tab_darwin.go index ba74f1f..e6e0c8a 100644 --- a/redo/tab_darwin.go +++ b/redo/tab_darwin.go @@ -25,7 +25,7 @@ func (t *tab) Append(name string, control Control) { t.tabs = append(t.tabs, c) cname := C.CString(name) defer C.free(unsafe.Pointer(cname)) - C.tabAppend(t._id, cname, c.view) + C.tabAppend(t._id, cname, c.id) } func (t *tab) id() C.id { diff --git a/redo/window_darwin.go b/redo/window_darwin.go index 3b131d3..ddd598e 100644 --- a/redo/window_darwin.go +++ b/redo/window_darwin.go @@ -28,7 +28,7 @@ func newWindow(title string, width int, height int, control Control) *window { container: newContainer(control), } C.windowSetDelegate(w.id, unsafe.Pointer(w)) - C.windowSetContentView(w.id, w.container.view) + C.windowSetContentView(w.id, w.container.id) return w } |
