diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-10 13:48:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-10 21:24:15 +0100 |
| commit | 97d09553425b59d030fd4d8f039a4a9994b674cf (patch) | |
| tree | 7c3c39943e70fe1fd7dbe9e666bec712ee4576b8 /vcl/unx/gtk | |
| parent | b97e713e76c88141d26f6e19a74db80a105cb911 (diff) | |
Related: tdf#112549 gtk3 hide/show menubar on enter/exit fullscreen
Change-Id: I0436d0f3404a88abd81c4eedea09b16c81536b61
Reviewed-on: https://gerrit.libreoffice.org/44599
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index e48b3bb336a6..e4a2e3c17d1f 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -21,6 +21,7 @@ #include <unx/gtk/gtkdata.hxx> #include <unx/gtk/gtkinst.hxx> #include <unx/gtk/gtkgdi.hxx> +#include <unx/gtk/gtksalmenu.hxx> #include <vcl/help.hxx> #include <vcl/keycodes.hxx> #include <vcl/layout.hxx> @@ -1415,11 +1416,7 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon ) void GtkSalFrame::SetMenu( SalMenu* pSalMenu ) { -// if(m_pSalMenu) -// { -// static_cast<GtkSalMenu*>(m_pSalMenu)->DisconnectFrame(); -// } - m_pSalMenu = pSalMenu; + m_pSalMenu = static_cast<GtkSalMenu*>(pSalMenu); } SalMenu* GtkSalFrame::GetMenu() |