diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-25 12:48:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-26 21:38:25 +0000 |
| commit | 800704e0c46f6f86f6a18a477ba4b6f313c5693a (patch) | |
| tree | 9cdbb39be5ba817c0075bbe78c8dd433b6865769 /vcl/inc | |
| parent | e08d84547fcb5db6f91deb1af3ec6b3a4b060caf (diff) | |
gtk3: native gtk menubar
Change-Id: Ibb75aa3eae99e499e1c2026c41b0bf51d7f8cf31
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index a5302147f5c3..cf97011c3b86 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -376,6 +376,9 @@ public: GtkWidget* getWindow() const { return m_pWindow; } GtkFixed* getFixedContainer() const { return m_pFixedContainer; } GtkWidget* getMouseEventWidget() const; +#if GTK_CHECK_VERSION(3,0,0) + GtkGrid* getTopLevelGridWidget() const { return m_pTopLevelGrid; } +#endif GdkWindow* getForeignParent() const { return m_pForeignParent; } GdkNativeWindow getForeignParentWindow() const { return m_aForeignParentWindow; } GdkWindow* getForeignTopLevel() const { return m_pForeignTopLevel; } diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 1697d0b95240..030905862597 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -44,7 +44,8 @@ private: std::vector< GtkSalMenuItem* > maItems; bool mbMenuBar; - bool mbMenuVisibility; + bool mbUnityMode; + GtkWidget* mpMenuBarWidget; Menu* mpVCLMenu; GtkSalMenu* mpParentSalMenu; GtkSalFrame* mpFrame; @@ -100,11 +101,14 @@ public: void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate( const gchar* aMenuCommand = nullptr ); void Deactivate( const gchar* aMenuCommand ); - void Display( bool bVisible ); + void EnableUnity(bool bEnable); bool PrepUpdate(); virtual void Update() override; // Update this menu only. void UpdateFull(); // Update full menu hierarchy from this menu. + void CreateMenuWidget(); + void DestroyMenuWidget(); + virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) override; }; |