diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-05-11 17:26:48 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-05-11 17:26:48 +0000 |
| commit | cfafea3205319e623aa8811a6305abe492e51569 (patch) | |
| tree | b47807f9fdee4e087f2a34a60037b107f87cad3a | |
| parent | 4c2dd05c96ab58fc9c41752ab786990b8e60b5bb (diff) | |
| download | gtk+-cfafea3205319e623aa8811a6305abe492e51569.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtkuimanager.c | 12 |
5 files changed, 16 insertions, 8 deletions
@@ -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. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9381c27db7..ae0c9ca9f7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9381c27db7..ae0c9ca9f7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9381c27db7..ae0c9ca9f7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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. diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index cfbfe4b217..7248628f08 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -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. <popup>) 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 <menu> + * 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 |