diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-05-19 14:32:04 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-05-19 14:35:07 +0200 |
| commit | ab216f7039d473a4e7b6c08d868d4dc376161539 (patch) | |
| tree | 81342c0d17f9fcbdb3e4228a39de2880497c04df /vcl/source/window/decoview.cxx | |
| parent | 9fe32d106e1fd23f281e1e70c48f9a45e86547ff (diff) | |
Accomodate gcc 4.2's inabilities to cope with complex templates.
Change-Id: I0a35849a02e3f185783c261a369052594583b082
Diffstat (limited to 'vcl/source/window/decoview.cxx')
| -rw-r--r-- | vcl/source/window/decoview.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index baba1e478493..e560ccf29573 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -653,9 +653,12 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, if( nStyle != DrawFrameStyle::NWF && pWin && pWin->IsNativeControlSupported(CTRL_FRAME, PART_BORDER) ) { - ImplControlValue aControlValue( static_cast<long>(nStyle) | static_cast<long>(nFlags) | - static_cast<long>(pWin->GetType()==WINDOW_BORDERWINDOW ? - DrawFrameFlags::BorderWindowBorder : DrawFrameFlags::NONE) ); + long nControlFlags = static_cast<long>(nStyle); + nControlFlags |= static_cast<long>(nFlags); + nControlFlags |= static_cast<long>(pWin->GetType()==WINDOW_BORDERWINDOW ? + DrawFrameFlags::BorderWindowBorder : DrawFrameFlags::NONE); + ImplControlValue aControlValue( nControlFlags ); + Rectangle aBound, aContent; Rectangle aNatRgn( rRect ); if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER, |