Kaydet (Commit) c8861af8 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

move TRANSPARENT #define from windows.h out of global namespace

so it doesn't conflict with enums

Change-Id: Ic4143130762d6e878d7c23276393ba09d9f86d45
Reviewed-on: https://gerrit.libreoffice.org/11880Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst dea50a9c
......@@ -27,6 +27,12 @@
#undef Folder
#undef GradientStyle_RECT
// so it doesn't conflict with enum values
#undef TRANSPARENT
#undef OPAQUE
#define WIN32_TRANSPARENT 1
#define WIN32_OPAQUE 2
#define WIN_WB_LEFT 0
#define WIN_WB_RIGHT 1
#undef WB_LEFT
......
......@@ -489,7 +489,7 @@ void ImplSalInitGraphics( WinSalGraphics* pData )
}
::SetTextAlign( pData->getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP );
::SetBkMode( pData->getHDC(), TRANSPARENT );
::SetBkMode( pData->getHDC(), WIN32_TRANSPARENT );
::SetROP2( pData->getHDC(), R2_COPYPEN );
}
......
......@@ -3409,7 +3409,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
// as some tools such as RichWin may have changed it
if ( pFrame->mpGraphics &&
pFrame->mpGraphics->getHDC() )
SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT );
SetBkMode( pFrame->mpGraphics->getHDC(), WIN32_TRANSPARENT );
// determine modifiers
if ( GetKeyState( VK_SHIFT ) & 0x8000 )
......@@ -5144,7 +5144,7 @@ static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam )
// as some tools such as RichWin may have changed it
if ( pFrame->mpGraphics &&
pFrame->mpGraphics->getHDC() )
SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT );
SetBkMode( pFrame->mpGraphics->getHDC(), WIN32_TRANSPARENT );
}
if ( pFrame && pFrame->mbHandleIME )
......
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