[Libreoffice-commits] .: Branch 'feature/unitymenus-master' - 3 commits - vcl/inc vcl/Library_vclplug_gtk.mk vcl/source

[Libreoffice Gerrit user]

 vcl/Library_vclplug_gtk.mk     |    2 +-
 vcl/inc/salmenu.hxx            |    2 +-
 vcl/inc/unx/gtk/gtksalmenu.hxx |    6 ------
 vcl/source/window/menu.cxx     |    3 ---
 4 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit a6239c20285945512becc9cdf3804072c5cedb0b
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Nov 14 10:51:07 2012 +0000

    remove unused prototype
    
    Change-Id: If3deb18695d0bef3545d6aef5e598435996a7207

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 53095b8..313da51 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -32,15 +32,9 @@
 #include <unx/gtk/glomenu.h>
 #include <unx/gtk/gloactiongroup.h>
 
-
 class MenuItemList;
 class GtkSalMenuItem;
 
-
-// Generate the complete structure of a menu.
-//static void GenerateFullMenu( GtkSalMenu* pSalMenu );
-
-
 class GtkSalMenu : public SalMenu
 {
 private:
commit 85a4cac3030c520e6ddd40196c1172533001eee7
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Nov 14 10:48:03 2012 +0000

    fix typo with ENABLE_DBUS.
    
    Change-Id: I4955fc9991ee88edde0d332b7e399ef5b807c4cc

diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index a95ea19..c43173a 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -105,7 +105,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
 ))
 $(eval $(call gb_Library_add_defs,vclplug_gtk,\
     -DENABLE_GIO=$(ENABLE_GIO) \
-    -DENABLE_DBUS=#(ENABLE_DBUS) \
+    -DENABLE_DBUS=$(ENABLE_DBUS) \
 ))
 endif
 endif
commit d340f2fdbe3d6e9c3b8583e23770766529648df5
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Nov 14 10:45:38 2012 +0000

    remove redundant commented code.
    
    Change-Id: Ia311bdd148cf4c346c187d3b37964b12cded1212

diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 5bea401..77b1cd7 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -82,7 +82,7 @@ public:
     virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure
     virtual void RemoveMenuBarButton( sal_uInt16 nId );
 
-    // FIXME: Make the other VCL native backends to work with these new methods.
+    // TODO: implement show/hide for the Win/Mac VCL native backends
     virtual void ShowItem( unsigned nPos, sal_Bool bShow ) { EnableItem( nPos, bShow ); }
 
     // return an empty rectangle if not implemented
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 7fbc21a..b6606b3 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1797,10 +1797,7 @@ void Menu::ShowItem( sal_uInt16 nItemId, sal_Bool bVisible )
         pData->bVisible = bVisible;
 
         // update native menu
-        // as long as there is no support to hide native menu entries, we just disable them
-        // TODO: add support to show/hide native menu entries
         if( ImplGetSalMenu() )
-//            ImplGetSalMenu()->EnableItem( nPos, bVisible );
             ImplGetSalMenu()->ShowItem( nPos, bVisible );
     }
 }