interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed residual ImageList references.

This commit is contained in:
Pietro Gagliardi 2015-02-20 00:17:15 -05:00
parent 958cae1964
commit c59d12d72d
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
image_unix.go
View File

@ -24,7 +24,7 @@ func toIconSizedGdkPixbuf(img *image.RGBA) *C.GdkPixbuf {
C.int(img.Rect.Dx()), C.int(img.Rect.Dx()),
C.int(img.Rect.Dy())) C.int(img.Rect.Dy()))
if status := C.cairo_surface_status(surface); status != C.CAIRO_STATUS_SUCCESS { if status := C.cairo_surface_status(surface); status != C.CAIRO_STATUS_SUCCESS {
panic(fmt.Errorf("cairo_create_image_surface() failed in ImageList.Append(): %s\n", panic(fmt.Errorf("cairo_create_image_surface() failed in toIconSizedGdkPixbuf(): %s\n",
C.GoString(C.cairo_status_to_string(status)))) C.GoString(C.cairo_status_to_string(status))))
} }
C.cairo_surface_flush(surface) C.cairo_surface_flush(surface)
@ -33,11 +33,11 @@ func toIconSizedGdkPixbuf(img *image.RGBA) *C.GdkPixbuf {
C.cairo_surface_mark_dirty(surface) C.cairo_surface_mark_dirty(surface)
basepixbuf := C.gdk_pixbuf_get_from_surface(surface, 0, 0, C.gint(img.Rect.Dx()), C.gint(img.Rect.Dy())) basepixbuf := C.gdk_pixbuf_get_from_surface(surface, 0, 0, C.gint(img.Rect.Dx()), C.gint(img.Rect.Dy()))
if basepixbuf == nil { if basepixbuf == nil {
panic(fmt.Errorf("gdk_pixbuf_get_from_surface() failed in ImageList.Append() (no reason available)")) panic(fmt.Errorf("gdk_pixbuf_get_from_surface() failed in toIconSizedGdkPixbuf() (no reason available)"))
} }
if C.gtk_icon_size_lookup(scaleTo, &width, &height) == C.FALSE { if C.gtk_icon_size_lookup(scaleTo, &width, &height) == C.FALSE {
panic(fmt.Errorf("gtk_icon_size_lookup() failed in ImageList.Append() (no reason available)")) panic(fmt.Errorf("gtk_icon_size_lookup() failed in toIconSizedGdkPixbuf() (no reason available)"))
} }
if int(width) == img.Rect.Dx() && int(height) == img.Rect.Dy() { if int(width) == img.Rect.Dx() && int(height) == img.Rect.Dy() {
// just return the base pixbuf; we're good // just return the base pixbuf; we're good
@ -47,7 +47,7 @@ func toIconSizedGdkPixbuf(img *image.RGBA) *C.GdkPixbuf {
// else scale // else scale
pixbuf := C.gdk_pixbuf_scale_simple(basepixbuf, C.int(width), C.int(height), C.GDK_INTERP_NEAREST) pixbuf := C.gdk_pixbuf_scale_simple(basepixbuf, C.int(width), C.int(height), C.GDK_INTERP_NEAREST)
if pixbuf == nil { if pixbuf == nil {
panic(fmt.Errorf("gdk_pixbuf_scale_simple() failed in ImageList.Append() (no reason available)")) panic(fmt.Errorf("gdk_pixbuf_scale_simple() failed in toIconSizedGdkPixbuf() (no reason available)"))
} }
C.g_object_unref(C.gpointer(unsafe.Pointer(basepixbuf))) C.g_object_unref(C.gpointer(unsafe.Pointer(basepixbuf)))

2
winapi_windows.h
View File

@ -24,8 +24,6 @@ enum {
msgTabCurrentTabHasChildren, msgTabCurrentTabHasChildren,
msgAreaKeyDown, msgAreaKeyDown,
msgAreaKeyUp, msgAreaKeyUp,
msgLoadImageList,
msgTableMakeInitialCheckboxImageList,
msgOpenFileDone, msgOpenFileDone,
}; };