include/vcl/syswin.hxx | 21 +--------------------
include/vcl/vclenum.hxx | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 20 deletions(-)
New commits:
commit 3f3281868e7516d7535071a01fcde63ed3d73e7e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 4 21:24:11 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 5 10:35:01 2018 +0200
move WindowStateMask into vclenum.hxx
Change-Id: Ia9e4d65f769c94f99a2eb23dd93d9d7cc81c398b
Reviewed-on: https://gerrit.libreoffice.org/61395
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index f9453f106a30..d8dd2f3c245c 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -24,6 +24,7 @@
#include <vcl/dllapi.h>
#include <vcl/builder.hxx>
#include <vcl/idle.hxx>
+#include <vcl/vclenum.hxx>
#include <vcl/window.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
@@ -42,26 +43,6 @@ class TaskPaneList;
#define ICON_MATH_DOCUMENT 13
#define ICON_MACROLIBRARY 1
-enum class WindowStateMask {
- NONE = 0x0000,
- X = 0x0001,
- Y = 0x0002,
- Width = 0x0004,
- Height = 0x0008,
- State = 0x0010,
- Minimized = 0x0020,
- MaximizedX = 0x0100,
- MaximizedY = 0x0200,
- MaximizedWidth = 0x0400,
- MaximizedHeight = 0x0800,
- Pos = X | Y,
- All = X | Y | Width | Height | MaximizedX | MaximizedY |
MaximizedWidth | MaximizedHeight | State | Minimized
-};
-namespace o3tl
-{
- template<> struct typed_flags<WindowStateMask> :
is_typed_flags<WindowStateMask, 0x0f3f> {};
-}
-
enum class WindowStateState {
NONE = 0x0000,
Normal = 0x0001,
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 0cf180cb6bc8..03e2c4661aff 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -118,6 +118,26 @@ namespace o3tl
template<> struct typed_flags<WindowBorderStyle> :
is_typed_flags<WindowBorderStyle, 0x3033> {};
}
+enum class WindowStateMask {
+ NONE = 0x0000,
+ X = 0x0001,
+ Y = 0x0002,
+ Width = 0x0004,
+ Height = 0x0008,
+ State = 0x0010,
+ Minimized = 0x0020,
+ MaximizedX = 0x0100,
+ MaximizedY = 0x0200,
+ MaximizedWidth = 0x0400,
+ MaximizedHeight = 0x0800,
+ Pos = X | Y,
+ All = X | Y | Width | Height | MaximizedX | MaximizedY |
MaximizedWidth | MaximizedHeight | State | Minimized
+};
+namespace o3tl
+{
+ template<> struct typed_flags<WindowStateMask> :
is_typed_flags<WindowStateMask, 0x0f3f> {};
+}
+
enum class TimeFormat
{
Hour12, Hour24
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
