Fixed the new Table without ImageList on Mac OS X. Now all we have left to do is reimplement the selection logic on Windows and we're good to roll!

This commit is contained in:
Pietro Gagliardi 2015-02-19 22:02:58 -05:00
parent 1d091637d8
commit efda6a235e
1 changed files with 1 additions and 5 deletions

View File

@ -60,10 +60,6 @@ func (t *table) Unlock() {
}() }()
} }
func (t *table) LoadImageList(i ImageList) {
i.apply(&t.images)
}
func (t *table) Selected() int { func (t *table) Selected() int {
t.RLock() t.RLock()
defer t.RUnlock() defer t.RUnlock()
@ -91,7 +87,7 @@ func goTableDataSource_getValue(data unsafe.Pointer, row C.intptr_t, col C.intpt
case datum.Type() == reflect.TypeOf((*image.RGBA)(nil)): case datum.Type() == reflect.TypeOf((*image.RGBA)(nil)):
*outtype = C.colTypeImage *outtype = C.colTypeImage
d := datum.Interface().(*image.RGBA) d := datum.Interface().(*image.RGBA)
img := C.toTableImage(unsafe.Pointer(pixelData(img)), C.intptr_t(d.Rect.Dx()), C.intptr_t(d.Rect.Dy()), C.intptr_t(d.Stride)) img := C.toTableImage(unsafe.Pointer(pixelData(d)), C.intptr_t(d.Rect.Dx()), C.intptr_t(d.Rect.Dy()), C.intptr_t(d.Stride))
return unsafe.Pointer(img) return unsafe.Pointer(img)
case datum.Kind() == reflect.Bool: case datum.Kind() == reflect.Bool:
*outtype = C.colTypeCheckbox *outtype = C.colTypeCheckbox