Internal native menu is created in steps, but is incomplete at the moment.

Change-Id: I323b80b74218be853fe2893b3f328ff3ef74d4cb

1 files changed, 21 insertions, 4 deletions

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 69fcec834cb9..65c2bc8051e8 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -35,22 +35,29 @@
 #include <unx/salmenu.h>
 #include <gio/gio.h>
 
+#include <vector>
+
+class GtkSalMenuItem;
+class GtkSalMenuSection;
 
 class GtkSalMenu : public SalMenu
 {
 private:
+
     sal_Bool                mbMenuBar;
 
-    virtual void publishMenu();
+    virtual void publishMenu( GMenuModel* );
 
 public:
+    std::vector< GtkSalMenuSection* >       maSections;
+    std::vector< GtkSalMenuItem* >          maItems;
+    GtkSalMenuSection*                      mpCurrentSection;
+
     Menu*                   mpVCLMenu;
     const GtkSalFrame*      mpFrame;
-    GMenuModel*             mpParentMenuModel;
-    GMenuModel*             mpMenuModel;
-    GMenuModel*             mpSectionMenuModel;
     gchar*                  aDBusMenubarPath;
     GDBusConnection*        pSessionBus;
+    sal_Int32               mBusId;
     sal_Int32               mMenubarId;
 
     GtkSalMenu( sal_Bool bMenuBar );
@@ -72,6 +79,16 @@ public:
     virtual void Freeze();
 };
 
+class GtkSalMenuItem;
+
+class GtkSalMenuSection
+{
+public:
+    std::vector< GtkSalMenuItem* >          maItems;
+
+    virtual ~GtkSalMenuSection();
+};
+
 class GtkSalMenuItem : public SalMenuItem
 {
 public: