AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Sigh, revert the change.

Browse Source 
2003-12-15  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkdialog.c: Sigh, revert the change.
This commit is contained in:
Federico Mena Quintero 2003-12-15 22:03:15 +00:00 committed by Federico Mena Quintero
parent 7054ddccd8
commit 69c2585f0d
6 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c: Sigh, revert the change.
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c: Sigh, revert the change.
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.

4
ChangeLog.pre-2-4
View File

@ -1,3 +1,7 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c: Sigh, revert the change.
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.

4
ChangeLog.pre-2-6
View File

@ -1,3 +1,7 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c: Sigh, revert the change.
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c: Sigh, revert the change.
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.

27
gtk/gtkdialog.c
View File

@ -354,6 +354,30 @@ gtk_dialog_style_set (GtkWidget *widget,
update_spacings (GTK_DIALOG (widget));
}
static gboolean
dialog_has_cancel (GtkDialog *dialog)
{
GList *children, *tmp_list;
gboolean ret = FALSE;
children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
{
ResponseData *rd = get_response_data (tmp_list->data);
if (rd && rd->response_id == GTK_RESPONSE_CANCEL)
{
ret = TRUE;
break;
}
}
g_list_free (children);
return ret;
}
static void
gtk_dialog_close (GtkDialog *dialog)
{
@ -362,6 +386,9 @@ gtk_dialog_close (GtkDialog *dialog)
GtkWidget *widget = GTK_WIDGET (dialog);
GdkEvent *event;
if (!dialog_has_cancel (dialog))
return;
event = gdk_event_new (GDK_DELETE);
event->any.window = g_object_ref (widget->window);