summaryrefslogtreecommitdiff
path: root/vcl/inc/unx/gtk/gtksalmenu.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc/unx/gtk/gtksalmenu.hxx')
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx37
1 files changed, 24 insertions, 13 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 3e30323821c5..3d1073bd8ab4 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -33,7 +33,10 @@
#include <vcl/bitmap.hxx>
#include <unx/gtk/gtkframe.hxx>
#include <unx/salmenu.h>
+
#include <gio/gio.h>
+
+#include "glomenu.h"
#include "gloactiongroup.h"
#include <vector>
@@ -41,8 +44,6 @@
class GtkSalMenuItem;
-typedef std::vector< GtkSalMenuItem* > GtkSalMenuSection;
-
class GtkSalMenu : public SalMenu
{
private:
@@ -53,17 +54,25 @@ private:
GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId );
public:
- std::vector< GtkSalMenuSection* > maSections;
- GtkSalMenuSection* mpCurrentSection;
-
- Menu* mpVCLMenu;
- GtkSalMenu* mpParentSalMenu;
- const GtkSalFrame* mpFrame;
- gchar* aDBusMenubarPath;
- GDBusConnection* pSessionBus;
- sal_Int32 mBusId;
- sal_Int32 mMenubarId;
- sal_Int32 mActionGroupId;
+ std::vector< GMenuModel* > maSections;
+ std::vector< GtkSalMenuItem* > maItems;
+
+ Menu* mpVCLMenu;
+ GtkSalMenu* mpParentSalMenu;
+ const GtkSalFrame* mpFrame;
+
+ // DBus variables
+ gchar* aDBusMenubarPath;
+ GDBusConnection* pSessionBus;
+ sal_Int32 mBusId;
+ sal_Int32 mMenubarId;
+ sal_Int32 mActionGroupId;
+
+ // GMenuModel attributes
+ GMenuModel* mpMenuModel;
+ GMenuModel* mpCurrentSection;
+// GLOMenu* mpParentMenuModel;
+// std::vector< GLOMenu* > maSectionMenus;
GtkSalMenu( sal_Bool bMenuBar );
virtual ~GtkSalMenu();
@@ -95,9 +104,11 @@ public:
virtual ~GtkSalMenuItem();
sal_uInt16 mnId; // Item ID
+ sal_uInt16 mnPos; // Item position
Menu* mpVCLMenu; // VCL Menu into which this MenuItem is inserted
GtkSalMenu* mpParentMenu; // The menu in which this menu item is inserted
GtkSalMenu* mpSubMenu; // Sub menu of this item (if defined)
+ GMenuModel* mpParentSection; // Section where this item is added.
GMenuItem* mpMenuItem; // The GMenuItem
GAction* mpAction; // The GAction associated with this item
};