diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-05-05 13:26:58 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-05-05 15:51:11 +0200 |
commit | f24590521c5ffea13c0aecdb2f30fdd39bbfbc45 (patch) | |
tree | 161d40f3c2f633d6d921b1e391e5004bb80b215d | |
parent | c724eebbaee76c9c91ba332173903aa4f4bd754a (diff) |
vcl: remove WIN32_TRANSPARENT
Change-Id: I164106e89cf910c2f9fa6815b23f58ad6c6ee789
-rw-r--r-- | include/postwin.h | 1 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/postwin.h b/include/postwin.h index febe581b4590..b9ad4cfceea6 100644 --- a/include/postwin.h +++ b/include/postwin.h @@ -29,7 +29,6 @@ // so it doesn't conflict with enum values #undef OPAQUE -#define WIN32_TRANSPARENT 1 #undef WB_LEFT #undef WB_RIGHT diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index a32bd9dd8e39..23d4e5ca1924 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -485,7 +485,7 @@ void WinSalGraphics::InitGraphics() } ::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP ); - ::SetBkMode( getHDC(), WIN32_TRANSPARENT ); + ::SetBkMode( getHDC(), TRANSPARENT ); ::SetROP2( getHDC(), R2_COPYPEN ); mpImpl->Init(); diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index a334afc792ee..f689dcc7bd25 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -3402,7 +3402,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(), WIN32_TRANSPARENT ); + SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT ); // determine modifiers 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 if ( pFrame->mpGraphics && pFrame->mpGraphics->getHDC() ) - SetBkMode( pFrame->mpGraphics->getHDC(), WIN32_TRANSPARENT ); + SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT ); } if ( pFrame && pFrame->mbHandleIME ) |