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

Removed. (gtk_dialog_close): Don't call dialog_has_cancel(). At least

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

	* gtk/gtkdialog.c (dialog_has_cancel): Removed.
	(gtk_dialog_close): Don't call dialog_has_cancel().  At least
	allows sane behavior for #101293.
This commit is contained in:
Federico Mena Quintero
2003-12-15 21:47:50 +00:00
committed by Federico Mena Quintero
parent 64687f7108
commit 7054ddccd8
6 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.
(gtk_dialog_close): Don't call dialog_has_cancel(). At least
allows sane behavior for #101293.
Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de> Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.
(gtk_dialog_close): Don't call dialog_has_cancel(). At least
allows sane behavior for #101293.
Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de> Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.
(gtk_dialog_close): Don't call dialog_has_cancel(). At least
allows sane behavior for #101293.
Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de> Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.
(gtk_dialog_close): Don't call dialog_has_cancel(). At least
allows sane behavior for #101293.
Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de> Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2003-12-15 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkdialog.c (dialog_has_cancel): Removed.
(gtk_dialog_close): Don't call dialog_has_cancel(). At least
allows sane behavior for #101293.
Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de> Mon Dec 15 00:56:54 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with

27
gtk/gtkdialog.c
View File

@ -354,30 +354,6 @@ gtk_dialog_style_set (GtkWidget *widget,
update_spacings (GTK_DIALOG (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 static void
gtk_dialog_close (GtkDialog *dialog) gtk_dialog_close (GtkDialog *dialog)
{ {
@ -386,9 +362,6 @@ gtk_dialog_close (GtkDialog *dialog)
GtkWidget *widget = GTK_WIDGET (dialog); GtkWidget *widget = GTK_WIDGET (dialog);
GdkEvent *event; GdkEvent *event;
if (!dialog_has_cancel (dialog))
return;
event = gdk_event_new (GDK_DELETE); event = gdk_event_new (GDK_DELETE);
event->any.window = g_object_ref (widget->window); event->any.window = g_object_ref (widget->window);