diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-08-26 18:50:35 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:44 +0100 |
| commit | f39fff93a461e930fc61bde43db6df53508d4c8f (patch) | |
| tree | 59cf12af7c081e70573a4704fe9635c4a567b034 /vcl/inc/unx/gtk/gtksalmenu.hxx | |
| parent | 73f0064fbcbe28ad8aecd1c41637cec18776908c (diff) | |
Menus are now working. HUD integration is broken.
Change-Id: I0f5fef169b2656a713416e28648a3260b22b43b0
Diffstat (limited to 'vcl/inc/unx/gtk/gtksalmenu.hxx')
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index a517c5eda9da..0e2131314bfa 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -52,9 +52,7 @@ private: GMenuModel* mpMenuModel; GActionGroup* mpActionGroup; - - sal_Int16 GetSectionNumber( GMenuModel* pSection ); - void GetInsertionData( unsigned nPos, unsigned *insertSection, unsigned *insertPos ); + void GetItemSectionAndPosition( unsigned nPos, unsigned *insertSection, unsigned *insertPos ); public: GtkSalMenu( sal_Bool bMenuBar ); @@ -84,7 +82,6 @@ public: virtual unsigned GetItemCount() { return maItems.size(); } virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } virtual GActionGroup* GetActionGroup() { return mpActionGroup; } -// virtual GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId ); }; class GtkSalMenuItem : public SalMenuItem @@ -96,6 +93,8 @@ public: sal_uInt16 mnId; // Item ID MenuItemBits mnBits; // Item bits MenuItemType mnType; // Item type + gchar* maCommand; // Item command + gchar* maLabel; // Item label 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) |