From 1e53d134f03831f4e0f6d3646c20283c4a01b897 Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Sun, 28 Feb 2016 10:27:28 +0200
Subject: mbUnityMode is always false

Change-Id: I7c4b05cd02dee2b6efb926955759d725428e1dc1
---
 vcl/inc/unx/gtk/gtksalmenu.hxx | 1 -
 vcl/unx/gtk/gtksalmenu.cxx     | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'vcl')

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index b88aec85e64e..51cb4511f75e 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -44,7 +44,6 @@ private:
     std::vector< GtkSalMenuItem* >  maItems;
 
     bool                            mbMenuBar;
-    bool                            mbUnityMode;
     GtkWidget*                      mpMenuBarWidget;
     GtkWidget*                      mpCloseButton;
     Menu*                           mpVCLMenu;
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index b89a35187dc9..e01c93454037 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -428,7 +428,6 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const Rectangle& /*rR
 
 GtkSalMenu::GtkSalMenu( bool bMenuBar ) :
     mbMenuBar( bMenuBar ),
-    mbUnityMode ( false ),
     mpMenuBarWidget( nullptr ),
     mpCloseButton( nullptr ),
     mpVCLMenu( nullptr ),
@@ -654,13 +653,11 @@ void GtkSalMenu::SetFrame(const SalFrame* pFrame)
     g_lo_menu_insert_section( pMenuModel, 0, nullptr, mpMenuModel );
 
 #if GTK_CHECK_VERSION(3,0,0)
-    if (!mbUnityMode)
+    if (!bUnityMode)
     {
         DestroyMenuBarWidget();
         CreateMenuBarWidget();
     }
-#else
-    (void)mbUnityMode;
 #endif
 }
 
-- 
cgit