mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: remove WIN32_TRANSPARENT

Browse Source 
Change-Id: I164106e89cf910c2f9fa6815b23f58ad6c6ee789
This commit is contained in:
Michael Stahl
2015-05-05 13:26:58 +02:00
parent c724eebbae
commit f24590521c
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/postwin.h
View File

@@ -29,7 +29,6 @@
// so it doesn't conflict with enum values // so it doesn't conflict with enum values
#undef OPAQUE #undef OPAQUE
#define WIN32_TRANSPARENT 1
#undef WB_LEFT #undef WB_LEFT
#undef WB_RIGHT #undef WB_RIGHT

2
vcl/win/source/gdi/salgdi.cxx
View File

@@ -485,7 +485,7 @@ void WinSalGraphics::InitGraphics()
} }
::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP ); ::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP );
::SetBkMode( getHDC(), WIN32_TRANSPARENT ); ::SetBkMode( getHDC(), TRANSPARENT );
::SetROP2( getHDC(), R2_COPYPEN ); ::SetROP2( getHDC(), R2_COPYPEN );
mpImpl->Init(); mpImpl->Init();

4
vcl/win/source/window/salframe.cxx
View File

@@ -3402,7 +3402,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
// as some tools such as RichWin may have changed it // as some tools such as RichWin may have changed it
if ( pFrame->mpGraphics && if ( pFrame->mpGraphics &&
pFrame->mpGraphics->getHDC() ) pFrame->mpGraphics->getHDC() )
SetBkMode( pFrame->mpGraphics->getHDC(), WIN32_TRANSPARENT ); SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT );
// determine modifiers // determine modifiers
if ( GetKeyState( VK_SHIFT ) & 0x8000 ) if ( GetKeyState( VK_SHIFT ) & 0x8000 )
@@ -5135,7 +5135,7 @@ static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam )
// as some tools such as RichWin may have changed it // as some tools such as RichWin may have changed it
if ( pFrame->mpGraphics && if ( pFrame->mpGraphics &&
pFrame->mpGraphics->getHDC() ) pFrame->mpGraphics->getHDC() )
SetBkMode( pFrame->mpGraphics->getHDC(), WIN32_TRANSPARENT ); SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT );
} }
if ( pFrame && pFrame->mbHandleIME ) if ( pFrame && pFrame->mbHandleIME )