Implemented the new MsgBox() transience behavior on GTK+.
This commit is contained in:
parent
7acc70c39e
commit
8e0a38dc47
|
@ -10,21 +10,43 @@ import (
|
|||
|
||||
// #include "gtk_unix.h"
|
||||
// /* because cgo seems to choke on ... */
|
||||
// GtkWidget *gtkNewMsgBox(GtkMessageType type, GtkButtonsType buttons, char *title, char *text)
|
||||
// /* parent will be NULL if there is no parent, so this is fine */
|
||||
// GtkWidget *gtkNewMsgBox(GtkWindow *parent, GtkMessageType type, GtkButtonsType buttons, char *title, char *text)
|
||||
// {
|
||||
// GtkWidget *k;
|
||||
//
|
||||
// k = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, type, buttons, "%s", (gchar *) title);
|
||||
// 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"
|
||||
|
||||
func _msgBox(primarytext string, secondarytext string, msgtype C.GtkMessageType, buttons C.GtkButtonsType) (result C.gint) {
|
||||
func _msgBox(parent *Window, primarytext string, secondarytext string, msgtype C.GtkMessageType, buttons C.GtkButtonsType) (result C.gint) {
|
||||
ret := make(chan C.gint)
|
||||
defer close(ret)
|
||||
uitask <- func() {
|
||||
var pwin *C.GtkWindow = nil
|
||||
|
||||
// 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 == nil can work properly
|
||||
// thanks to pbor and mclasen in irc.gimp.net/#gtk+
|
||||
var prevgroup *C.GtkWindowGroup = nil
|
||||
var newgroup *C.GtkWindowGroup
|
||||
|
||||
if parent != nil {
|
||||
pwin = togtkwindow(parent.sysData.widget)
|
||||
// we can't remove a window from the "default window group"; otherwise this throws up Gtk-CRITICAL warnings
|
||||
if C.gtk_window_has_group(pwin) != C.FALSE {
|
||||
prevgroup = C.gtk_window_get_group(pwin)
|
||||
C.gtk_window_group_remove_window(prevgroup, pwin)
|
||||
}
|
||||
newgroup = C.gtk_window_group_new()
|
||||
C.gtk_window_group_add_window(newgroup, pwin)
|
||||
}
|
||||
|
||||
cprimarytext := C.CString(primarytext)
|
||||
defer C.free(unsafe.Pointer(cprimarytext))
|
||||
csecondarytext := (*C.char)(nil)
|
||||
|
@ -32,18 +54,27 @@ func _msgBox(primarytext string, secondarytext string, msgtype C.GtkMessageType,
|
|||
csecondarytext = C.CString(secondarytext)
|
||||
defer C.free(unsafe.Pointer(csecondarytext))
|
||||
}
|
||||
box := C.gtkNewMsgBox(msgtype, buttons, cprimarytext, csecondarytext)
|
||||
box := C.gtkNewMsgBox(pwin, msgtype, buttons, cprimarytext, csecondarytext)
|
||||
response := C.gtk_dialog_run((*C.GtkDialog)(unsafe.Pointer(box)))
|
||||
C.gtk_widget_destroy(box)
|
||||
|
||||
if parent != nil {
|
||||
C.gtk_window_group_remove_window(newgroup, pwin)
|
||||
C.g_object_unref(C.gpointer(unsafe.Pointer(newgroup))) // free the group
|
||||
if prevgroup != nil {
|
||||
C.gtk_window_group_add_window(prevgroup, pwin)
|
||||
} // otherwise it'll go back into the default group on its own
|
||||
}
|
||||
|
||||
ret <- response
|
||||
}
|
||||
return <-ret
|
||||
}
|
||||
|
||||
func msgBox(primarytext string, secondarytext string) {
|
||||
_msgBox(primarytext, secondarytext, C.GtkMessageType(C.GTK_MESSAGE_OTHER), C.GtkButtonsType(C.GTK_BUTTONS_OK))
|
||||
func msgBox(parent *Window, primarytext string, secondarytext string) {
|
||||
_msgBox(parent, primarytext, secondarytext, C.GtkMessageType(C.GTK_MESSAGE_OTHER), C.GtkButtonsType(C.GTK_BUTTONS_OK))
|
||||
}
|
||||
|
||||
func msgBoxError(primarytext string, secondarytext string) {
|
||||
_msgBox(primarytext, secondarytext, C.GtkMessageType(C.GTK_MESSAGE_ERROR), C.GtkButtonsType(C.GTK_BUTTONS_OK))
|
||||
func msgBoxError(parent *Window, primarytext string, secondarytext string) {
|
||||
_msgBox(parent, primarytext, secondarytext, C.GtkMessageType(C.GTK_MESSAGE_ERROR), C.GtkButtonsType(C.GTK_BUTTONS_OK))
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue