From 9e3b1236b68069016d646b5682ce541335b5340c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 26 May 2015 15:22:10 +0200
Subject: convert WINDOW_DLGCTRL flags to scoped enum

Change-Id: I6c3a95cdcb15e5b1d4adb13908a751b06a302e20
---
 include/vcl/window.hxx | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 9b9ebd27d3e3..ec12c25b496b 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -349,10 +349,18 @@ enum class StateChangedType : sal_uInt16
 #define WINDOW_DRAW_ROLLOVER            ((sal_uLong)0x00000100)
 
 // DialogControl-Flags
-#define WINDOW_DLGCTRL_RETURN           ((sal_uInt16)0x0001)
-#define WINDOW_DLGCTRL_WANTFOCUS        ((sal_uInt16)0x0002)
-#define WINDOW_DLGCTRL_MOD1TAB          ((sal_uInt16)0x0004)
-#define WINDOW_DLGCTRL_FLOATWIN_POPUPMODEEND_CANCEL ((sal_uInt16)0x0008)
+enum class DialogControlFlags
+{
+    NONE                       = 0x0000,
+    Return                     = 0x0001,
+    WantFocus                  = 0x0002,
+    Mod1Tab                    = 0x0004,
+    FloatWinPopupModeEndCancel = 0x0008,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<DialogControlFlags> : is_typed_flags<DialogControlFlags, 0x000f> {};
+}
 
 // EndExtTextInput() Flags
 enum class EndExtTextInputFlags
@@ -900,8 +908,8 @@ public:
     bool                                IsPaintTransparent() const;
     void                                SetDialogControlStart( bool bStart );
     bool                                IsDialogControlStart() const;
-    void                                SetDialogControlFlags( sal_uInt16 nFlags );
-    sal_uInt16                          GetDialogControlFlags() const;
+    void                                SetDialogControlFlags( DialogControlFlags nFlags );
+    DialogControlFlags                  GetDialogControlFlags() const;
 
     struct PointerState
     {
-- 
cgit