[Libreoffice-commits] core.git: vcl/inc vcl/osx

[Noel Grandin]

 vcl/inc/osx/salmenu.h |    2 +-
 vcl/osx/salmenu.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6ef580e7922adf85b3bd60af679c1fd51cfc8490
Author: Noel Grandin <noel at peralex.com>
Date:   Wed May 13 09:51:35 2015 +0200

    fix OSX build
    
    after my commit facc91ab4a3f25b3290408c7083ed4c09dd8d759
    "convert FLOATWIN_POPUPMODE constants to scoped enum"
    
    Change-Id: I5c2264eb2bab9ace89a72adecc840bc5d9d80b9d

diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index 1419050..941a1b2 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -69,7 +69,7 @@ public:
     virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE;
     virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
     virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
-    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags) SAL_OVERRIDE;
+    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) SAL_OVERRIDE;
     virtual bool AddMenuBarButton( const SalMenuButtonItem& ) SAL_OVERRIDE;
     virtual void RemoveMenuBarButton( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) SAL_OVERRIDE;
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 4d7fb8f..63fb8ef 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -348,7 +348,7 @@ sal_Int32 removeUnusedItemsRunner(NSMenu * pMenu)
     return drawnItems;
 }
 
-bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags)
+bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags)
 {
     // do not use native popup menu when AQUA_NATIVE_MENUS is set to false
     if( ! VisibleMenuBar() ) {