AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert the previous change to this function, clarify the docs instead.

Browse Source 
2004-05-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Revert the
	previous change to this function, clarify the docs instead.
This commit is contained in:
Matthias Clasen 2004-05-11 17:26:48 +00:00 committed by Matthias Clasen
parent 4c2dd05c96
commit cfafea3205
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-05-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Revert the
previous change to this function, clarify the docs instead.
* gtk/gtkcombobox.c (gtk_combo_box_list_setup): Use
GTK_SELECTION_BROWSE.

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2004-05-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Revert the
previous change to this function, clarify the docs instead.
* gtk/gtkcombobox.c (gtk_combo_box_list_setup): Use
GTK_SELECTION_BROWSE.

3
ChangeLog.pre-2-6
View File

@ -1,5 +1,8 @@
2004-05-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Revert the
previous change to this function, clarify the docs instead.
* gtk/gtkcombobox.c (gtk_combo_box_list_setup): Use
GTK_SELECTION_BROWSE.

3
ChangeLog.pre-2-8
View File

@ -1,5 +1,8 @@
2004-05-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Revert the
previous change to this function, clarify the docs instead.
* gtk/gtkcombobox.c (gtk_combo_box_list_setup): Use
GTK_SELECTION_BROWSE.

12
gtk/gtkuimanager.c
View File

@ -689,6 +689,9 @@ gtk_ui_manager_get_accel_group (GtkUIManager *self)
* separated by '/'. Elements which don't have a name or action attribute in
* the XML (e.g. &lt;popup&gt;) can be addressed by their XML element name
* (e.g. "popup"). The root element ("/ui") can be omitted in the path.
*
* Note that the widget found by following a path that ends in a &lt;menu&gt;
* element is the menuitem to which the menu is attached, not the menu itself.
*
* Return value: the widget found by following the path, or %NULL if no widget
* was found.
@ -715,14 +718,7 @@ gtk_ui_manager_get_widget (GtkUIManager *self,
if (node == NULL)
return NULL;
if (NODE_INFO (node)->type == NODE_TYPE_MENU)
{
GtkWidget *proxy = NODE_INFO (node)->proxy;
return gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy));
}
else
return NODE_INFO (node)->proxy;
return NODE_INFO (node)->proxy;
}
static void