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

fix OSX build (take 2)

after my commit 7ac403aa7cb2bd531245280d88bdc9fe6553c711
"convert FRAME_DRAW constants to scoped enum"

Change-Id: I9aa8b267b5ca8f1ffaf2302c91d337f0906089f8
üst 69c32b13
...@@ -1319,9 +1319,10 @@ bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa ...@@ -1319,9 +1319,10 @@ bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
break; break;
case CTRL_FRAME: 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 ) && if( ( nPart == PART_BORDER ) &&
!( nStyle & (DrawFrameFlags::Menu | DrawFrameFlags::WindowBorder | DrawFrameFlags::BorderWindowBorder) ) ) !( nFlags & (DrawFrameFlags::Menu | DrawFrameFlags::WindowBorder | DrawFrameFlags::BorderWindowBorder) ) )
{ {
Rectangle aRect(aCtrlBoundRect); Rectangle aRect(aCtrlBoundRect);
if( nStyle & DrawFrameStyle::DoubleIn ) if( nStyle & DrawFrameStyle::DoubleIn )
......
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