diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-28 10:29:26 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-28 10:35:14 +0200 |
| commit | 48217c28706d22306d17ab7d73b702389d7545a4 (patch) | |
| tree | 134b432cc220db6a3c4a7f2afcd60172be1ccfe5 /vcl | |
| parent | 1e53d134f03831f4e0f6d3646c20283c4a01b897 (diff) | |
Fix gtk2 menubar
Change-Id: I0605e570022f6eb57d453a3eb8bea5f4314c8229
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index e01c93454037..d828a7cc259a 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -80,7 +80,11 @@ static gchar* GetCommandForItem( GtkSalMenuItem* pSalMenuItem, gchar* aCurrentCo bool GtkSalMenu::PrepUpdate() { +#if GTK_CHECK_VERSION(3,0,0) return mpMenuModel && mpActionGroup; +#else + return bUnityMode && mpMenuModel && mpActionGroup; +#endif } /* @@ -461,7 +465,11 @@ GtkSalMenu::~GtkSalMenu() bool GtkSalMenu::VisibleMenuBar() { +#if GTK_CHECK_VERSION(3,0,0) return mbMenuBar; +#else + return mbMenuBar && bUnityMode; +#endif } void GtkSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) |