Moved it all back; the preemptive multitaksing during an event handler kills us on all platforms. Going to have to restrict ALL GUI accss to happening from one t hread, so going to need to drop uitask entirely and have just a start() callback for startup code and a post() function for posting requests to windows (like channel sends but into a perpetual buffer).

1 files changed, 0 insertions, 106 deletions

diff --git a/prevlib/dialog_unix.go b/prevlib/dialog_unix.go
deleted file mode 100644
index 9728e2a..0000000
--- a/prevlib/dialog_unix.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// +build !windows,!darwin,!plan9
-
-// 7 february 2014
-
-package ui
-
-import (
-	"unsafe"
-)
-
-// #include "gtk_unix.h"
-// /* because cgo seems to choke on ... */
-// /* parent will be NULL if there is no parent, so this is fine */
-// static inline GtkWidget *gtkNewMsgBox(GtkWindow *parent, GtkMessageType type, GtkButtonsType buttons, char *title, char *text)
-// {
-// 	GtkWidget *k;
-//
-// 	k = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL, type, buttons, "%s", (gchar *) title);
-// 	if (text != NULL)
-// 		gtk_message_dialog_format_secondary_text((GtkMessageDialog *) k, "%s", (gchar *) text);
-// 	return k;
-// }
-import "C"
-
-// the actual type of these constants is GtkResponseType but gtk_dialog_run() returns a gint
-var dialogResponses = map[C.gint]Response{
-	C.GTK_RESPONSE_OK:		OK,
-}
-
-// dialog performs the bookkeeping involved for having a GtkDialog behave the way we want.
-type dialog struct {
-	parent    *Window
-	pwin      *C.GtkWindow
-	hadgroup  C.gboolean
-	prevgroup *C.GtkWindowGroup
-	newgroup  *C.GtkWindowGroup
-	result    Response
-}
-
-func mkdialog(parent *Window) *dialog {
-	return &dialog{
-		parent: parent,
-	}
-}
-
-func (d *dialog) prepare() {
-	// to implement parent, we need to put the GtkMessageDialog into a new window group along with parent
-	// a GtkWindow can only be part of one group
-	// so we use this to save the parent window group (if there is one) and store the new window group
-	// after showing the message box, we restore the previous window group, so future parent == dialogWindow can work properly
-	// thanks to pbor and mclasen in irc.gimp.net/#gtk+
-	if d.parent != dialogWindow {
-		d.pwin = togtkwindow(d.parent.sysData.widget)
-		d.hadgroup = C.gtk_window_has_group(d.pwin)
-		// we can't remove a window from the "default window group"; otherwise this throws up Gtk-CRITICAL warnings
-		if d.hadgroup != C.FALSE {
-			d.prevgroup = C.gtk_window_get_group(d.pwin)
-			C.gtk_window_group_remove_window(d.prevgroup, d.pwin)
-		}
-		d.newgroup = C.gtk_window_group_new()
-		C.gtk_window_group_add_window(d.newgroup, d.pwin)
-	}
-}
-
-func (d *dialog) cleanup(box *C.GtkWidget) {
-	// have to explicitly close the dialog box, otherwise wacky things will happen
-	C.gtk_widget_destroy(box)
-	if d.parent != dialogWindow {
-		C.gtk_window_group_remove_window(d.newgroup, d.pwin)
-		C.g_object_unref(C.gpointer(unsafe.Pointer(d.newgroup))) // free the group
-		if d.prevgroup != nil {
-			C.gtk_window_group_add_window(d.prevgroup, d.pwin)
-		} // otherwise it'll go back into the default group on its own
-	}
-}
-
-func (d *dialog) run(mk func() *C.GtkWidget) {
-	d.prepare()
-	box := mk()
-	r := C.gtk_dialog_run((*C.GtkDialog)(unsafe.Pointer(box)))
-	d.cleanup(box)
-	d.result = dialogResponses[r]
-}
-
-func _msgBox(parent *Window, primarytext string, secondarytext string, msgtype C.GtkMessageType, buttons C.GtkButtonsType) (response Response) {
-	d := mkdialog(parent)
-	cprimarytext := C.CString(primarytext)
-	defer C.free(unsafe.Pointer(cprimarytext))
-	csecondarytext := (*C.char)(nil)
-	if secondarytext != "" {
-		csecondarytext = C.CString(secondarytext)
-		defer C.free(unsafe.Pointer(csecondarytext))
-	}
-	d.run(func() *C.GtkWidget {
-		return C.gtkNewMsgBox(d.pwin, msgtype, buttons, cprimarytext, csecondarytext)
-	})
-	return d.result
-}
-
-func (w *Window) msgBox(primarytext string, secondarytext string) {
-	_msgBox(w, primarytext, secondarytext, C.GtkMessageType(C.GTK_MESSAGE_OTHER), C.GtkButtonsType(C.GTK_BUTTONS_OK))
-}
-
-func (w *Window) msgBoxError(primarytext string, secondarytext string) {
-	_msgBox(w, primarytext, secondarytext, C.GtkMessageType(C.GTK_MESSAGE_ERROR), C.GtkButtonsType(C.GTK_BUTTONS_OK))
-}