diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-18 16:32:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-19 06:53:09 +0200 |
| commit | 4105174973aaabc25148e53571b7a4fc356098de (patch) | |
| tree | 7a5b9797fab59a6a33782435f5b29be6f5dc166f /include | |
| parent | 793246e1ae1266e8bd4261aa45dad40f5da16785 (diff) | |
convert extended WinBits to scoped enum
Change-Id: If35f4fcda2415c858ba8f963e9f471c87169bc99
Reviewed-on: https://gerrit.libreoffice.org/41301
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/wintypes.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index 7c0c29a87a82..def5ffd6bb09 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -271,10 +271,6 @@ WinBits const WB_SAVEAS = 0x00400000; // Window-Bits for TabControl WinBits const WB_SLIDERSET = 0x02000000; -// extended WinBits -WinBits const WB_EXT_DOCUMENT = 0x00000001; -WinBits const WB_EXT_DOCMODIFIED = 0x00000002; - // WindowAlign enum class WindowAlign { Left, Top, Right, Bottom }; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 3b8a42ac5d0b..c4d3540df1d9 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -451,8 +451,9 @@ class ImplDockingWindowWrapper; class ImplPopupFloatWin; class MenuFloatingWindow; class LifecycleTest; - namespace svt { class PopupWindowControllerImpl; } + + enum class WindowHitTest { NONE = 0x0000, Inside = 0x0001, @@ -462,6 +463,16 @@ namespace o3tl { template<> struct typed_flags<WindowHitTest> : is_typed_flags<WindowHitTest, 0x0003> {}; }; + +enum class WindowExtendedStyle { + NONE = 0x0000, + Document = 0x0001, + DocModified = 0x0002, +}; +namespace o3tl { + template<> struct typed_flags<WindowExtendedStyle> : is_typed_flags<WindowExtendedStyle, 0x0003> {}; +}; + namespace vcl { class VCL_DLLPUBLIC RenderTools @@ -823,8 +834,8 @@ public: void SetStyle( WinBits nStyle ); WinBits GetStyle() const; WinBits GetPrevStyle() const; - void SetExtendedStyle( WinBits nExtendedStyle ); - WinBits GetExtendedStyle() const; + void SetExtendedStyle( WindowExtendedStyle nExtendedStyle ); + WindowExtendedStyle GetExtendedStyle() const; void SetType( WindowType nType ); WindowType GetType() const; bool IsSystemWindow() const; |