callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the GTK_DESTROYED flag to GTK_IN_DESTRUCTION, remove the

Browse Source 
Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkobject.h docs/Changes-2.0.txt: Rename the
	GTK_DESTROYED flag to GTK_IN_DESTRUCTION, remove the
	GTK_OBJECT_DESTROYED() check macro.

	* gtk/gtkbindings.c (gtk_bindings_activate): Remove
	instances of GTK_OBJECT_DESTROYED() that weren't
	needed any more.

	* gtk/gtkdialog.c: Exchange use of GTK_OBJECT_DESTROYED
	for a connection to ::destroy.
This commit is contained in:
Owen Taylor
2001-11-19 01:08:51 +00:00
committed by Owen Taylor
parent 3432dff2e0
commit e4be2240b7
12 changed files with 133 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkdialog.c
View File

@ -770,6 +770,7 @@ typedef struct
GtkDialog *dialog;
gint response_id;
GMainLoop *loop;
gboolean destroyed;
} RunInfo;
static void
@ -813,6 +814,16 @@ run_delete_handler (GtkDialog *dialog,
return TRUE; /* Do not destroy */
}
static void
run_destroy_handler (GtkDialog *dialog, gpointer data)
{
RunInfo *ri = data;
/* shutdown_loop will be called by run_unmap_handler */
ri->destroyed = TRUE;
}
/**
* gtk_dialog_run:
* @dialog: a #GtkDialog
@ -861,6 +872,7 @@ gtk_dialog_run (GtkDialog *dialog)
RunInfo ri = { NULL, GTK_RESPONSE_NONE, NULL };
gboolean was_modal;
guint response_handler;
guint unmap_handler;
guint destroy_handler;
guint delete_handler;
@ -881,7 +893,7 @@ gtk_dialog_run (GtkDialog *dialog)
GTK_SIGNAL_FUNC (run_response_handler),
&ri);
destroy_handler =
unmap_handler =
gtk_signal_connect (GTK_OBJECT (dialog),
"unmap",
GTK_SIGNAL_FUNC (run_unmap_handler),
@ -893,6 +905,12 @@ gtk_dialog_run (GtkDialog *dialog)
GTK_SIGNAL_FUNC (run_delete_handler),
&ri);
destroy_handler =
gtk_signal_connect (GTK_OBJECT (dialog),
"destroy",
GTK_SIGNAL_FUNC (run_destroy_handler),
&ri);
ri.loop = g_main_new (FALSE);
GDK_THREADS_LEAVE ();
@ -902,22 +920,20 @@ gtk_dialog_run (GtkDialog *dialog)
g_main_loop_unref (ri.loop);
ri.loop = NULL;
ri.destroyed = FALSE;
if (!GTK_OBJECT_DESTROYED (dialog))
if (!ri.destroyed)
{
if (!was_modal)
gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
gtk_signal_disconnect (GTK_OBJECT (dialog), destroy_handler);
gtk_signal_disconnect (GTK_OBJECT (dialog), response_handler);
gtk_signal_disconnect (GTK_OBJECT (dialog), unmap_handler);
gtk_signal_disconnect (GTK_OBJECT (dialog), delete_handler);
gtk_signal_disconnect (GTK_OBJECT (dialog), destroy_handler);
}
gtk_object_unref (GTK_OBJECT (dialog));
return ri.response_id;
}