diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-05-05 13:21:43 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-05-05 15:51:10 +0200 |
| commit | c724eebbaee76c9c91ba332173903aa4f4bd754a (patch) | |
| tree | fce4460b0335030578d9cfb87861f82aba15a385 /include | |
| parent | cbaca2c1cea2a4a75e21b2b13d79f50858d7d186 (diff) | |
vcl: rename conflicting defintion of TRANSPARENT remove it from postwin.h
Change-Id: I3b4e25c27593e3a61612a96baa2a4378542d151c
Diffstat (limited to 'include')
| -rw-r--r-- | include/postwin.h | 1 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/postwin.h b/include/postwin.h index 555478dece0f..febe581b4590 100644 --- a/include/postwin.h +++ b/include/postwin.h @@ -28,7 +28,6 @@ #undef GradientStyle_RECT // so it doesn't conflict with enum values -#undef TRANSPARENT #undef OPAQUE #define WIN32_TRANSPARENT 1 diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 80ec0c79e007..68a16093ab79 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -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, |