diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2012-09-11 11:38:06 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2012-09-17 12:31:22 -0400 |
| commit | dd143479fe85f16e4ea010a7b03d4365d9d9234e (patch) | |
| tree | 6101e20075598591dcfa355c5c12f9c73b250937 /gtk/gtkapplicationwindow.c | |
| parent | 778aa7ade0107fa645ab1427132551d138c7334a (diff) | |
| download | gtk+-dd143479fe85f16e4ea010a7b03d4365d9d9234e.tar.gz | |
gtkmodelmenu: simplify logic, expose bind API
Make the main (and only) entry-point to gtkmodelmenu.c the now-public
gtk_menu_shell_bind_model().
Move the convenience constructors (gtk_menu_new_from_model() and
gtk_menu_bar_new_from_model()) to their proper files.
Remove the private header file.
Simplify the code a bit by making the initial populate part of the
bind() call.
https://bugzilla.gnome.org/show_bug.cgi?id=682831
Diffstat (limited to 'gtk/gtkapplicationwindow.c')
| -rw-r--r-- | gtk/gtkapplicationwindow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 0632bed5e4..2a9215a4a6 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -24,9 +24,9 @@ #include "gtkapplicationprivate.h" #include "gtkwidgetprivate.h" #include "gtkwindowprivate.h" -#include "gtkmodelmenu.h" #include "gtkaccelgroup.h" #include "gtkaccelmap.h" +#include "gtkmenubar.h" #include "gtkintl.h" #include "gtksettings.h" @@ -256,7 +256,7 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window) g_menu_append_section (combined, NULL, G_MENU_MODEL (window->priv->app_menu_section)); g_menu_append_section (combined, NULL, G_MENU_MODEL (window->priv->menubar_section)); - window->priv->menubar = gtk_model_menu_create_menu_bar (G_MENU_MODEL (combined)); + window->priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined)); gtk_widget_set_parent (window->priv->menubar, GTK_WIDGET (window)); gtk_widget_show_all (window->priv->menubar); g_object_unref (combined); |