forked from AuroraMiddleware/gtk
Fix attach/attach->parent type. (#136919, Tim Mooney)
Thu Mar 11 16:28:15 2004 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent type. (#136919, Tim Mooney)
This commit is contained in:
parent
865d3dd267
commit
5c2b9546d6
@ -1,3 +1,8 @@
|
|||||||
|
Thu Mar 11 16:28:15 2004 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
|
||||||
|
type. (#136919, Tim Mooney)
|
||||||
|
|
||||||
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Thu Mar 11 16:28:15 2004 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
|
||||||
|
type. (#136919, Tim Mooney)
|
||||||
|
|
||||||
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Thu Mar 11 16:28:15 2004 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
|
||||||
|
type. (#136919, Tim Mooney)
|
||||||
|
|
||||||
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Thu Mar 11 16:28:15 2004 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
|
||||||
|
type. (#136919, Tim Mooney)
|
||||||
|
|
||||||
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Thu Mar 11 16:28:15 2004 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
|
||||||
|
type. (#136919, Tim Mooney)
|
||||||
|
|
||||||
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
Thu Mar 11 16:18:51 2004 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
|
||||||
|
@ -1659,10 +1659,10 @@ gtk_menu_get_toplevel (GtkWidget *menu)
|
|||||||
attach = attach->parent;
|
attach = attach->parent;
|
||||||
|
|
||||||
if (GTK_IS_MENU (attach))
|
if (GTK_IS_MENU (attach))
|
||||||
return gtk_menu_get_toplevel (attach->parent);
|
return gtk_menu_get_toplevel (attach);
|
||||||
else if (GTK_IS_WIDGET (attach))
|
else if (GTK_IS_WIDGET (attach))
|
||||||
{
|
{
|
||||||
toplevel = gtk_widget_get_toplevel (attach->parent);
|
toplevel = gtk_widget_get_toplevel (attach);
|
||||||
if (GTK_WIDGET_TOPLEVEL (toplevel))
|
if (GTK_WIDGET_TOPLEVEL (toplevel))
|
||||||
return toplevel;
|
return toplevel;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user