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

Resolved TODOs in listbox_unix.go; also rewrote some related if expressions there to be clearer.

This commit is contained in:
Pietro Gagliardi 2014-04-27 15:06:52 -04:00
parent 6bd5d10730
commit bc39fbe1bf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
listbox_unix.go
View File

@ -5,6 +5,7 @@
package ui package ui
import ( import (
"fmt"
"unsafe" "unsafe"
) )
@ -146,7 +147,7 @@ func gListboxSelectedMulti(widget *C.GtkWidget) (indices []int) {
sel := C.gtk_tree_view_get_selection(tv) sel := C.gtk_tree_view_get_selection(tv)
rows := C.gtk_tree_selection_get_selected_rows(sel, &model) rows := C.gtk_tree_selection_get_selected_rows(sel, &model)
defer C.g_list_free_full(rows, C.GDestroyNotify(unsafe.Pointer(C.gtk_tree_path_free))) defer C.g_list_free_full(rows, C.GDestroyNotify(unsafe.Pointer(C.gtk_tree_path_free)))
// TODO needed? // g_list_length() is O(N), but we need the length below, alas
len := C.g_list_length(rows) len := C.g_list_length(rows)
if len == 0 { if len == 0 {
return nil return nil
@ -177,9 +178,8 @@ func gListboxSelMultiTexts(widget *C.GtkWidget) (texts []string) {
texts = make([]string, len) texts = make([]string, len)
for i := C.guint(0); i < len; i++ { for i := C.guint(0); i < len; i++ {
path := (*C.GtkTreePath)(unsafe.Pointer(rows.data)) path := (*C.GtkTreePath)(unsafe.Pointer(rows.data))
if !fromgbool(C.gtk_tree_model_get_iter(model, &iter, path)) { if C.gtk_tree_model_get_iter(model, &iter, path) == C.FALSE {
// TODO panic("gtk_tree_model_get_iter() failed getting Listbox selected texts; reason unknown")
return
} }
C.gtkTreeModelGet(model, &iter, &gs) C.gtkTreeModelGet(model, &iter, &gs)
texts[i] = fromgstr(gs) texts[i] = fromgstr(gs)
@ -193,9 +193,8 @@ func gListboxDelete(widget *C.GtkWidget, index int) {
tv := getTreeViewFrom(widget) tv := getTreeViewFrom(widget)
ls := (*C.GtkListStore)(unsafe.Pointer(C.gtk_tree_view_get_model(tv))) ls := (*C.GtkListStore)(unsafe.Pointer(C.gtk_tree_view_get_model(tv)))
if !fromgbool(C.gtk_tree_model_iter_nth_child((*C.GtkTreeModel)(unsafe.Pointer(ls)), &iter, (*C.GtkTreeIter)(nil), C.gint(index))) { // no such index if C.gtk_tree_model_iter_nth_child((*C.GtkTreeModel)(unsafe.Pointer(ls)), &iter, (*C.GtkTreeIter)(nil), C.gint(index)) == C.FALSE {
// TODO panic(fmt.Errorf("error deleting row %d from GTK+ Listbox: no such index or some other error", index))
return
} }
C.gtk_list_store_remove(ls, &iter) C.gtk_list_store_remove(ls, &iter)
} }