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

ui.Go() on GTK+ now reports the reason gtk_init() failed in its error return.

This commit is contained in:
Pietro Gagliardi 2014-04-27 12:43:15 -04:00
parent 6978961661
commit 6a2fb35d60
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtkcalls_unix.go
View File

@ -14,9 +14,16 @@ import (
// #include "gtk_unix.h" // #include "gtk_unix.h"
import "C" import "C"
func gtk_init() bool { func gtk_init() error {
var err *C.GError = nil // redundant in Go, but let's explicitly assign it anyway
// gtk_init_with_args() gives us error info (thanks chpe in irc.gimp.net/#gtk+)
// TODO allow GTK+ standard command-line argument processing // TODO allow GTK+ standard command-line argument processing
return fromgbool(C.gtk_init_check((*C.int)(nil), (***C.char)(nil))) result := C.gtk_init_with_args(nil, nil, nil, nil, nil, &err)
if result == C.FALSE {
return fmt.Errorf("%s", fromgstr(err.message))
}
return nil
} }
func gtk_main() { func gtk_main() {
@ -71,7 +78,7 @@ var gtkLayoutCSS = []byte(`GtkLayout {
`) `)
func makeTransparent(layout *C.GtkWidget) { func makeTransparent(layout *C.GtkWidget) {
var err *C.GError = nil // redundant in Go, but let's explicitly assign it anyway var err *C.GError = nil
provider := C.gtk_css_provider_new() provider := C.gtk_css_provider_new()
added := C.gtk_css_provider_load_from_data(provider, added := C.gtk_css_provider_load_from_data(provider,

5
uitask_unix.go
View File

@ -15,8 +15,9 @@ func ui(main func()) error {
runtime.LockOSThread() runtime.LockOSThread()
uitask = make(chan func()) uitask = make(chan func())
if gtk_init() != true { err := gtk_init()
return fmt.Errorf("gtk_init failed (reason unknown; TODO)") if err != nil {
return fmt.Errorf("gtk_init() failed: %v", err)
} }
// thanks to tristan and Daniel_S in irc.gimp.net/#gtk // thanks to tristan and Daniel_S in irc.gimp.net/#gtk