From c5c209427dbb3fc2932210ddc138421cfed1baa4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 13 May 2015 09:14:34 +0200
Subject: [PATCH] fix OSX build (take 2)
after my commit 7ac403aa7cb2bd531245280d88bdc9fe6553c711
"convert FRAME_DRAW constants to scoped enum"
Change-Id: I9aa8b267b5ca8f1ffaf2302c91d337f0906089f8
---
vcl/osx/salnativewidgets.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 0e762edb2997..fc033f56b980 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -1319,9 +1319,10 @@ bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
break;
case CTRL_FRAME:
{
- DrawFrameFlags nStyle = static_cast<DrawFrameFlags>(aValue.getNumericVal());
+ DrawFrameStyle nStyle = static_cast<DrawFrameStyle>(aValue.getNumericVal() & 0x000f);
+ DrawFrameFlags nFlags = static_cast<DrawFrameFlags>(aValue.getNumericVal() & 0xfff0);
if( ( nPart == PART_BORDER ) &&
- !( nStyle & (DrawFrameFlags::Menu | DrawFrameFlags::WindowBorder | DrawFrameFlags::BorderWindowBorder) ) )
+ !( nFlags & (DrawFrameFlags::Menu | DrawFrameFlags::WindowBorder | DrawFrameFlags::BorderWindowBorder) ) )
{
Rectangle aRect(aCtrlBoundRect);
if( nStyle & DrawFrameStyle::DoubleIn )
--
2.18.1