Commit cfafea32 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

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

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.
parent 4c2dd05c
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.
......
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.
......
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.
......
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.
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment