Menu is now displayed properly in all windows.

Change-Id: I9f8cffc3d19bb4c75c1153ff9f06fd5bab3440f6

2 files changed, 87 insertions, 84 deletions

diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
index b71ae47d20d9..431b93b0bf0c 100644
--- a/vcl/inc/unx/gtk/gloactiongroup.h
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
@@ -52,6 +52,9 @@ void                g_lo_action_group_insert                    (GLOActionGroup
 void                g_lo_action_group_remove                    (GLOActionGroup     *group,
                                                                  const gchar        *action_name);
 
+// This function has been added to make current implementation of GtkSalMenu work.
+void                g_lo_action_group_clear                     (GLOActionGroup     *group);
+
 void                g_lo_action_group_add_entries               (GLOActionGroup     *group,
                                                                  const GActionEntry *entries,
                                                                  gint                n_entries,
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h
index 54c7b5baaeaf..db2f034198de 100644
--- a/vcl/inc/unx/gtk/glomenu.h
+++ b/vcl/inc/unx/gtk/glomenu.h
@@ -42,91 +42,91 @@ typedef struct _GLOMenuItem GLOMenuItem;
 typedef struct _GLOMenu     GLOMenu;
 
 GLIB_AVAILABLE_IN_2_32
-GType       g_lo_menu_get_type                         (void) G_GNUC_CONST;
+GType           g_lo_menu_get_type                          (void) G_GNUC_CONST;
 GLIB_AVAILABLE_IN_2_32
-GLOMenu *     g_lo_menu_new                              (void);
-
-void        g_lo_menu_freeze                           (GLOMenu       *menu);
-
-void        g_lo_menu_insert_item                      (GLOMenu       *menu,
-                                                        gint         position,
-                                                        GLOMenuItem   *item);
-void        g_lo_menu_prepend_item                     (GLOMenu       *menu,
-                                                        GLOMenuItem   *item);
-void        g_lo_menu_append_item                      (GLOMenu       *menu,
-                                                        GLOMenuItem   *item);
-void        g_lo_menu_remove                           (GLOMenu       *menu,
-                                                        gint         position);
-
-void        g_lo_menu_insert                           (GLOMenu       *menu,
-                                                        gint         position,
-                                                        const gchar *label,
-                                                        const gchar *detailed_action);
-void        g_lo_menu_prepend                          (GLOMenu       *menu,
-                                                        const gchar *label,
-                                                        const gchar *detailed_action);
-void        g_lo_menu_append                           (GLOMenu       *menu,
-                                                        const gchar *label,
-                                                        const gchar *detailed_action);
-
-void        g_lo_menu_insert_section                   (GLOMenu       *menu,
-                                                        gint         position,
-                                                        const gchar *label,
-                                                        GMenuModel  *section);
-void        g_lo_menu_prepend_section                  (GLOMenu       *menu,
-                                                        const gchar *label,
-                                                        GMenuModel  *section);
-void        g_lo_menu_append_section                   (GLOMenu       *menu,
-                                                        const gchar *label,
-                                                        GMenuModel  *section);
-
-void        g_lo_menu_insert_submenu                   (GLOMenu       *menu,
-                                                        gint        position,
-                                                        const gchar *label,
-                                                        GMenuModel  *submenu);
-void        g_lo_menu_prepend_submenu                  (GLOMenu       *menu,
-                                                        const gchar *label,
-                                                        GMenuModel  *submenu);
-void        g_lo_menu_append_submenu                   (GLOMenu       *menu,
-                                                        const gchar *label,
-                                                        GMenuModel  *submenu);
-
-
-GType       g_lo_menu_item_get_type                    (void) G_GNUC_CONST;
-GLOMenuItem * g_lo_menu_item_new                         (const gchar *label,
-                                                        const gchar *detailed_action);
-
-GLOMenuItem * g_lo_menu_item_new_submenu                 (const gchar *label,
-                                                        GMenuModel  *submenu);
-
-GLOMenuItem * g_lo_menu_item_new_section                 (const gchar *label,
-                                                        GMenuModel  *section);
-
-void        g_lo_menu_item_set_attribute_value         (GLOMenuItem   *menu_item,
-                                                        const gchar *attribute,
-                                                        GVariant    *value);
-void        g_lo_menu_item_set_attribute               (GLOMenuItem   *menu_item,
-                                                        const gchar *attribute,
-                                                        const gchar *format_string,
-                                                        ...);
-void        g_lo_menu_item_set_link                    (GLOMenuItem   *menu_item,
-                                                        const gchar *link,
-                                                        GMenuModel  *model);
-void        g_lo_menu_item_set_label                   (GLOMenuItem   *menu_item,
-                                                     const gchar *label);
-void        g_lo_menu_item_set_submenu                 (GLOMenuItem   *menu_item,
-                                                     GMenuModel  *submenu);
-void        g_lo_menu_item_set_section                 (GLOMenuItem   *menu_item,
-                                                     GMenuModel  *section);
-void        g_lo_menu_item_set_action_and_target_value (GLOMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     GVariant    *target_value);
-void        g_lo_menu_item_set_action_and_target       (GLOMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     const gchar *format_string,
-                                                     ...);
-void        g_lo_menu_item_set_detailed_action         (GLOMenuItem   *menu_item,
-                                                     const gchar *detailed_action);
+GLOMenu *       g_lo_menu_new                               (void);
+
+void            g_lo_menu_freeze                            (GLOMenu     *menu);
+
+void            g_lo_menu_insert_item                       (GLOMenu     *menu,
+                                                             gint         position,
+                                                             GLOMenuItem *item);
+void            g_lo_menu_prepend_item                      (GLOMenu     *menu,
+                                                             GLOMenuItem *item);
+void            g_lo_menu_append_item                       (GLOMenu     *menu,
+                                                             GLOMenuItem *item);
+void            g_lo_menu_remove                            (GLOMenu     *menu,
+                                                             gint         position);
+
+void            g_lo_menu_insert                            (GLOMenu     *menu,
+                                                             gint         position,
+                                                             const gchar *label,
+                                                             const gchar *detailed_action);
+void            g_lo_menu_prepend                           (GLOMenu     *menu,
+                                                             const gchar *label,
+                                                             const gchar *detailed_action);
+void            g_lo_menu_append                            (GLOMenu     *menu,
+                                                             const gchar *label,
+                                                             const gchar *detailed_action);
+
+void            g_lo_menu_insert_section                    (GLOMenu     *menu,
+                                                             gint         position,
+                                                             const gchar *label,
+                                                             GMenuModel  *section);
+void            g_lo_menu_prepend_section                   (GLOMenu     *menu,
+                                                             const gchar *label,
+                                                             GMenuModel  *section);
+void            g_lo_menu_append_section                    (GLOMenu     *menu,
+                                                             const gchar *label,
+                                                             GMenuModel  *section);
+
+void            g_lo_menu_insert_submenu                    (GLOMenu     *menu,
+                                                             gint         position,
+                                                             const gchar *label,
+                                                             GMenuModel  *submenu);
+void            g_lo_menu_prepend_submenu                   (GLOMenu     *menu,
+                                                             const gchar *label,
+                                                             GMenuModel  *submenu);
+void            g_lo_menu_append_submenu                    (GLOMenu     *menu,
+                                                             const gchar *label,
+                                                             GMenuModel  *submenu);
+
+
+GType           g_lo_menu_item_get_type                     (void) G_GNUC_CONST;
+GLOMenuItem *   g_lo_menu_item_new                          (const gchar *label,
+                                                             const gchar *detailed_action);
+
+GLOMenuItem *   g_lo_menu_item_new_submenu                  (const gchar *label,
+                                                             GMenuModel  *submenu);
+
+GLOMenuItem *   g_lo_menu_item_new_section                  (const gchar *label,
+                                                             GMenuModel  *section);
+
+void            g_lo_menu_item_set_attribute_value          (GLOMenuItem *menu_item,
+                                                             const gchar *attribute,
+                                                             GVariant    *value);
+void            g_lo_menu_item_set_attribute                (GLOMenuItem *menu_item,
+                                                             const gchar *attribute,
+                                                             const gchar *format_string,
+                                                             ...);
+void            g_lo_menu_item_set_link                     (GLOMenuItem *menu_item,
+                                                             const gchar *link,
+                                                             GMenuModel  *model);
+void            g_lo_menu_item_set_label                    (GLOMenuItem *menu_item,
+                                                             const gchar *label);
+void            g_lo_menu_item_set_submenu                  (GLOMenuItem *menu_item,
+                                                             GMenuModel  *submenu);
+void            g_lo_menu_item_set_section                  (GLOMenuItem *menu_item,
+                                                             GMenuModel  *section);
+void            g_lo_menu_item_set_action_and_target_value  (GLOMenuItem *menu_item,
+                                                             const gchar *action,
+                                                             GVariant    *target_value);
+void            g_lo_menu_item_set_action_and_target        (GLOMenuItem *menu_item,
+                                                             const gchar *action,
+                                                             const gchar *format_string,
+                                                             ...);
+void            g_lo_menu_item_set_detailed_action          (GLOMenuItem *menu_item,
+                                                             const gchar *detailed_action);
 
 G_END_DECLS