diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-08-21 15:03:30 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:43 +0100 |
| commit | b29792bfd3e6aae9fdb94d7f072c23ea1629a7ef (patch) | |
| tree | 742245c0e07a619c838888fce66bb3bf30491f2f /vcl/inc | |
| parent | 7a22cf8f880944aace65e81f56dd988dec5d0269 (diff) | |
Items are not duplicated anymore, but launching a new instance crashes.
Change-Id: Ib3966c8578b0c4695c1f2cea89c3df234f597922
Diffstat (limited to 'vcl/inc')
| -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 c57d39d703db..9332cb6e75e5 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -62,11 +62,11 @@ private: // GMenuModel and GActionGroup attributes GMenuModel* mpMenuModel; - GMenuModel* mpCurrentSection; GActionGroup* mpActionGroup; GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId ); - sal_Int16 GetSectionNumber( GMenuModel* pSection ); + sal_Int16 GetSectionNumber( GMenuModel* pSection ); + void GetInsertionData( unsigned nPos, unsigned *insertSection, unsigned *insertPos ); public: GtkSalMenu( sal_Bool bMenuBar ); @@ -93,7 +93,7 @@ public: virtual Menu* GetMenu() { return mpVCLMenu; } virtual GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } virtual GMenuModel* GetMenuModel() { return mpMenuModel; } - virtual GMenuModel* GetCurrentSection() { return mpCurrentSection; } +// virtual GMenuModel* GetCurrentSection() { return mpCurrentSection; } virtual unsigned GetItemCount() { return maItems.size(); } virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } virtual GActionGroup* GetActionGroup() { return mpActionGroup; } @@ -107,7 +107,6 @@ public: sal_uInt16 mnId; // Item ID MenuItemBits mnBits; // Item bits - sal_uInt16 mnPos; // Item position gchar* maCommand; // Item command Menu* mpVCLMenu; // VCL Menu into which this MenuItem is inserted GtkSalMenu* mpParentMenu; // The menu in which this menu item is inserted |