Kaydet (Commit) c724eebb authored tarafından Michael Stahl's avatar Michael Stahl

vcl: rename conflicting defintion of TRANSPARENT remove it from postwin.h

Change-Id: I3b4e25c27593e3a61612a96baa2a4378542d151c
üst cbaca2c1
......@@ -28,7 +28,6 @@
#undef GradientStyle_RECT
// so it doesn't conflict with enum values
#undef TRANSPARENT
#undef OPAQUE
#define WIN32_TRANSPARENT 1
......
......@@ -231,9 +231,6 @@ template<class T> class VclPtr;
#define AUTOSCROLL_VERT ((sal_uInt16)0x0001)
#define AUTOSCROLL_HORZ ((sal_uInt16)0x0002)
#ifdef TRANSPARENT
#undef TRANSPARENT
#endif
// Flags for StateChanged()
enum class StateChangedType : sal_uInt16
{
......@@ -248,7 +245,7 @@ enum class StateChangedType : sal_uInt16
STYLE = 9,
ZOOM = 10,
BORDER = 11,
TRANSPARENT = 12,
Transparent = 12,
CONTROLFONT = 13,
CONTROLFOREGROUND = 14,
CONTROLBACKGROUND = 15,
......
......@@ -919,7 +919,7 @@ void WinMtfOutput::UpdateLineStyle()
void WinMtfOutput::UpdateFillStyle()
{
if ( !mbFillStyleSelected ) // SJ: #i57205# taking care of bkcolor if no brush is selected
maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode == BkMode::TRANSPARENT );
maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode == BkMode::Transparent );
if (!( maLatestFillStyle == maFillStyle ) )
{
maLatestFillStyle = maFillStyle;
......@@ -1410,7 +1410,7 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, long* pDXArry, b
aTmp.SetColor( maTextColor );
aTmp.SetFillColor( maBkColor );
if( mnBkMode == BkMode::TRANSPARENT )
if( mnBkMode == BkMode::Transparent )
aTmp.SetTransparent( true );
else
aTmp.SetTransparent( false );
......
......@@ -41,7 +41,7 @@
enum class BkMode
{
NONE = 0,
TRANSPARENT = 1,
Transparent = 1,
OPAQUE = 2,
LAST = 2
};
......
......@@ -2025,7 +2025,7 @@ void Window::StateChanged(StateChangedType eType)
//stuff that doesn't invalidate the layout
case StateChangedType::CONTROLFOREGROUND:
case StateChangedType::CONTROLBACKGROUND:
case StateChangedType::TRANSPARENT:
case StateChangedType::Transparent:
case StateChangedType::UPDATEMODE:
case StateChangedType::READONLY:
case StateChangedType::ENABLE:
......
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