diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 01:20:01 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-27 01:22:58 +0200 |
| commit | 68fb0521999babdc24acbae3fc2ddd35fc7f4006 (patch) | |
| tree | f483b44452402a5e0a0b598e86be843228caa407 /vcl/headless | |
| parent | 57db240b8ba477bbbe19b3d0a04d64454b4884a3 (diff) | |
No need for two sets of names for the same frame/window state bits
Bin the SAL_FRAMESTATE_* defines which as the comment said had to be the same
as the WINDOWSTATE_*] in syswin.hxx.
Change-Id: I42fcd91db543821f007038e558872ba8f69e4a78
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpframe.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index a94e051873fb..8a234dfb1fdd 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -18,6 +18,7 @@ */ #include <string.h> +#include "vcl/syswin.hxx" #include "headless/svpframe.hxx" #include "headless/svpinst.hxx" #include "headless/svpgdi.hxx" @@ -309,8 +310,8 @@ SalFrame* SvpSalFrame::GetParent() const } #define _FRAMESTATE_MASK_GEOMETRY \ - (SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y | \ - SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT) + (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | \ + WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT) void SvpSalFrame::SetWindowState( const SalFrameState *pState ) { @@ -326,13 +327,13 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState ) long nHeight = maGeometry.nHeight; // change requested properties - if (pState->mnMask & SAL_FRAMESTATE_MASK_X) + if (pState->mnMask & WINDOWSTATE_MASK_X) nX = pState->mnX; - if (pState->mnMask & SAL_FRAMESTATE_MASK_Y) + if (pState->mnMask & WINDOWSTATE_MASK_Y) nY = pState->mnY; - if (pState->mnMask & SAL_FRAMESTATE_MASK_WIDTH) + if (pState->mnMask & WINDOWSTATE_MASK_WIDTH) nWidth = pState->mnWidth; - if (pState->mnMask & SAL_FRAMESTATE_MASK_HEIGHT) + if (pState->mnMask & WINDOWSTATE_MASK_HEIGHT) nHeight = pState->mnHeight; SetPosSize( nX, nY, nWidth, nHeight, @@ -343,12 +344,12 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState ) sal_Bool SvpSalFrame::GetWindowState( SalFrameState* pState ) { - pState->mnState = SAL_FRAMESTATE_NORMAL; + pState->mnState = WINDOWSTATE_STATE_NORMAL; pState->mnX = maGeometry.nX; pState->mnY = maGeometry.nY; pState->mnWidth = maGeometry.nWidth; pState->mnHeight = maGeometry.nHeight; - pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | SAL_FRAMESTATE_MASK_STATE; + pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE; return sal_True; } |