diff options
author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-08-09 19:01:52 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:40 +0100 |
commit | f9de89386c9ca1e62afe12e7c3a4a87e90f04fef (patch) | |
tree | 231d29b46f65cb2f9007f42b7751326a876d4526 /vcl/inc | |
parent | d687291aa9bc66929471e7b07188c4fcd1ba591b (diff) |
Items are now correctly enabled and disabled.
Change-Id: I93e3e4bf804ff1ec95368f2918581af33d22263c
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index bb629693a290..3e30323821c5 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -38,22 +38,23 @@ #include <vector> + class GtkSalMenuItem; -class GtkSalMenuSection; + +typedef std::vector< GtkSalMenuItem* > GtkSalMenuSection; class GtkSalMenu : public SalMenu { private: -// static GLOActionGroup* pCurrentActionGroup; sal_Bool mbMenuBar; virtual void publishMenu( GMenuModel*, GActionGroup* ); + GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId ); + public: std::vector< GtkSalMenuSection* > maSections; - std::vector< GtkSalMenuItem* > maItems; GtkSalMenuSection* mpCurrentSection; - GActionEntry* mpActionEntry; Menu* mpVCLMenu; GtkSalMenu* mpParentSalMenu; @@ -87,16 +88,6 @@ public: virtual const GtkSalFrame* getFrame() const; }; -class GtkSalMenuItem; - -class GtkSalMenuSection -{ -public: - std::vector< GtkSalMenuItem* > maItems; - - virtual ~GtkSalMenuSection(); -}; - class GtkSalMenuItem : public SalMenuItem { public: |