Kaydet (Commit) 6ef580e7 authored tarafından Noel Grandin's avatar Noel Grandin

fix OSX build

after my commit facc91ab
"convert FLOATWIN_POPUPMODE constants to scoped enum"

Change-Id: I5c2264eb2bab9ace89a72adecc840bc5d9d80b9d
üst cf301dcd
......@@ -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;
......
......@@ -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() ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment