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

Add new function gtk_menu_get_for_attach_widget. (bug #113112).

Browse Source 
2004-05-06  Padraig O'Briain  <padraig.obriain@sun.com>

	* gtk/gtkmenu.h:
	* gtk/gtkmenu.c: Add new function gtk_menu_get_for_attach_widget.
	(bug #113112).
This commit is contained in:
Padraig O'Briain
2004-05-06 07:35:26 +00:00
committed by Padraig O'Briain
parent c723dd7e48
commit 1d66490a5f
6 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-06 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenu.h:
* gtk/gtkmenu.c: Add new function gtk_menu_get_for_attach_widget.
(bug #113112).
Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de> Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h: * gtk/gtkactiongroup.h:

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2004-05-06 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenu.h:
* gtk/gtkmenu.c: Add new function gtk_menu_get_for_attach_widget.
(bug #113112).
Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de> Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h: * gtk/gtkactiongroup.h:

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2004-05-06 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenu.h:
* gtk/gtkmenu.c: Add new function gtk_menu_get_for_attach_widget.
(bug #113112).
Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de> Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h: * gtk/gtkactiongroup.h:

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2004-05-06 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenu.h:
* gtk/gtkmenu.c: Add new function gtk_menu_get_for_attach_widget.
(bug #113112).
Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de> Thu May 6 00:24:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h: * gtk/gtkactiongroup.h:

38
gtk/gtkmenu.c
View File

@ -62,6 +62,7 @@
#define MENU_SCROLL_TIMEOUT2 50 #define MENU_SCROLL_TIMEOUT2 50
#define ATTACH_INFO_KEY "gtk-menu-child-attach-info-key" #define ATTACH_INFO_KEY "gtk-menu-child-attach-info-key"
#define ATTACHED_MENUS "gtk-attached-menus"
typedef struct _GtkMenuAttachData GtkMenuAttachData; typedef struct _GtkMenuAttachData GtkMenuAttachData;
typedef struct _GtkMenuPrivate GtkMenuPrivate; typedef struct _GtkMenuPrivate GtkMenuPrivate;
@ -984,6 +985,7 @@ gtk_menu_attach_to_widget (GtkMenu *menu,
GtkMenuDetachFunc detacher) GtkMenuDetachFunc detacher)
{ {
GtkMenuAttachData *data; GtkMenuAttachData *data;
GList *list;
g_return_if_fail (GTK_IS_MENU (menu)); g_return_if_fail (GTK_IS_MENU (menu));
g_return_if_fail (GTK_IS_WIDGET (attach_widget)); g_return_if_fail (GTK_IS_WIDGET (attach_widget));
@ -1012,6 +1014,12 @@ gtk_menu_attach_to_widget (GtkMenu *menu,
data->detacher = detacher; data->detacher = detacher;
g_object_set_data (G_OBJECT (menu), attach_data_key, data); g_object_set_data (G_OBJECT (menu), attach_data_key, data);
list = g_object_get_data (G_OBJECT (attach_widget), ATTACHED_MENUS);
if (!g_list_find (list, menu))
{
list = g_list_prepend (list, menu);
}
g_object_set_data_full (G_OBJECT (attach_widget), ATTACHED_MENUS, list, (GtkDestroyNotify) g_list_free);
if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL) if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL)
gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL); gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL);
@ -1041,6 +1049,7 @@ void
gtk_menu_detach (GtkMenu *menu) gtk_menu_detach (GtkMenu *menu)
{ {
GtkMenuAttachData *data; GtkMenuAttachData *data;
GList *list;
g_return_if_fail (GTK_IS_MENU (menu)); g_return_if_fail (GTK_IS_MENU (menu));
@ -1059,6 +1068,12 @@ gtk_menu_detach (GtkMenu *menu)
menu); menu);
data->detacher (data->attach_widget, menu); data->detacher (data->attach_widget, menu);
list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS);
list = g_list_remove (list, menu);
if (list)
g_object_set_data_full (G_OBJECT (data->attach_widget), ATTACHED_MENUS, list, (GtkDestroyNotify) g_list_free);
else
g_object_set_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS, NULL);
if (GTK_WIDGET_REALIZED (menu)) if (GTK_WIDGET_REALIZED (menu))
gtk_widget_unrealize (GTK_WIDGET (menu)); gtk_widget_unrealize (GTK_WIDGET (menu));
@ -4173,3 +4188,26 @@ gtk_menu_set_monitor (GtkMenu *menu,
priv->monitor_num = monitor_num; priv->monitor_num = monitor_num;
} }
/**
* gtk_menu_get_for_attach_widget:
* @widget: a #GtkWidget
*
* Returns a list of the menus which are attached to this widget.
* This list is owned by GTK+ and must not be modified.
*
* Return value: the list of menus attached to his widget.
*
* Since: 2.6
**/
GList*
gtk_menu_get_for_attach_widget (GtkWidget *widget)
{
GList *list;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
list = g_object_get_data (G_OBJECT (widget), ATTACHED_MENUS);
return list;
}

1
gtk/gtkmenu.h
View File

@ -198,6 +198,7 @@ void gtk_menu_attach (GtkMenu *menu,
void gtk_menu_set_monitor (GtkMenu *menu, void gtk_menu_set_monitor (GtkMenu *menu,
gint monitor_num); gint monitor_num);
GList* gtk_menu_get_for_attach_widget (GtkWidget *widget);
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
#define gtk_menu_append(menu,child) gtk_menu_shell_append ((GtkMenuShell *)(menu),(child)) #define gtk_menu_append(menu,child) gtk_menu_shell_append ((GtkMenuShell *)(menu),(child))