diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-02-25 10:53:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-25 21:12:33 +0100 |
commit | 9ad76a23eb25daddeec5f2586a10487c8a7bdc36 (patch) | |
tree | 5635272c9cb0e4ac2e8d60788b76cb1798cf5991 /include | |
parent | 27272097e6492ac8919a3132d28e72aa9645bebc (diff) |
allow use of FloatWinPopupFlags without including complete floatwin.hxx
Change-Id: Ica412938ead6f213668b3aa876bff81d8f512f1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111526
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/floatwin.hxx | 22 | ||||
-rw-r--r-- | include/vcl/vclenum.hxx | 21 |
2 files changed, 21 insertions, 22 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index ef3c38c6bd72..1c715a46cbc7 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -27,28 +27,6 @@ class ToolBox; - -enum class FloatWinPopupFlags -{ - NONE = 0x000000, - AllowTearOff = 0x000001, - Down = 0x000002, - Up = 0x000004, - Left = 0x000008, - Right = 0x000010, - NoKeyClose = 0x000020, - AllMouseButtonClose = 0x000040, - NoAppFocusClose = 0x000080, - NewLevel = 0x000100, - NoMouseUpClose = 0x000200, - GrabFocus = 0x000400, - NoHorzPlacement = 0x000800, -}; -namespace o3tl -{ - template<> struct typed_flags<FloatWinPopupFlags> : is_typed_flags<FloatWinPopupFlags, 0x0fff> {}; -} - enum class FloatWinPopupEndFlags { NONE = 0x00, diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 3e8fb266610b..005e48c5406a 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -366,6 +366,27 @@ enum class TxtAlign Right }; +enum class FloatWinPopupFlags +{ + NONE = 0x000000, + AllowTearOff = 0x000001, + Down = 0x000002, + Up = 0x000004, + Left = 0x000008, + Right = 0x000010, + NoKeyClose = 0x000020, + AllMouseButtonClose = 0x000040, + NoAppFocusClose = 0x000080, + NewLevel = 0x000100, + NoMouseUpClose = 0x000200, + GrabFocus = 0x000400, + NoHorzPlacement = 0x000800, +}; +namespace o3tl +{ + template<> struct typed_flags<FloatWinPopupFlags> : is_typed_flags<FloatWinPopupFlags, 0x0fff> {}; +} + #endif // INCLUDED_VCL_VCLENUM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |