diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-09-10 15:29:46 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:47 +0100 |
| commit | 44192ffba03ffe5b1f387f90893dc0ca22bc8762 (patch) | |
| tree | 84bf406849a935ec9e338abca8fd0d6a50b0203d /vcl/inc | |
| parent | e935a8da3c6e5d790f5ddc3a45faf1297d1f62f1 (diff) | |
Menu is now shown/hidden when needed.
Change-Id: I4a5d155918f7147c3c2933fedad96d959accca61
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 5 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 0f24b34d0355..3c7c10614271 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -212,6 +212,9 @@ class GtkSalFrame : public SalFrame GdkRegion* m_pRegion; #endif + SalMenu* m_pSalMenu; + sal_uInt32 m_nWatcherId; + void Init( SalFrame* pParent, sal_uLong nStyle ); void Init( SystemParentData* pSysData ); void InitCommon(); @@ -337,7 +340,9 @@ public: virtual void SetTitle( const rtl::OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu *pSalMenu ); + virtual SalMenu* GetMenu( void ); virtual void DrawMenuBar(); + void SetWatcherId( sal_uInt32 watcherId ); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); // Before the window is visible, a resize event diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index d4eb4cd6dc53..1785591ea7e6 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -137,7 +137,6 @@ public: void subtractEvent( sal_uInt16 nMask ); boost::shared_ptr<vcl::unx::GtkPrintWrapper> getPrintWrapper() const; - private: std::vector<GtkSalTimer *> m_aTimers; bool IsTimerExpired(); diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 38ac78461d30..ddb6a6bb6c26 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -44,21 +44,25 @@ private: std::vector< GtkSalMenuItem* > maItems; sal_Bool mbMenuBar; + sal_Bool mbVisible; Menu* mpVCLMenu; GtkSalMenu* mpParentSalMenu; const GtkSalFrame* mpFrame; + sal_uInt32 mWatcherId; + // GMenuModel and GActionGroup attributes GMenuModel* mpMenuModel; GActionGroup* mpActionGroup; - sal_Int32 GetPositionFromItem( GtkSalMenuItem* pSalMenuItem ); - void GetItemSectionAndPosition( unsigned nPos, unsigned *insertSection, unsigned *insertPos ); + sal_Int32 GetPositionFromItem( GtkSalMenuItem* pSalMenuItem ); + void GetItemSectionAndPosition( unsigned nPos, unsigned *insertSection, unsigned *insertPos ); public: GtkSalMenu( sal_Bool bMenuBar ); virtual ~GtkSalMenu(); + virtual void SetVisibleMenuBar( sal_Bool bVisible ); virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) |