diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-28 14:56:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 08:32:06 +0000 |
| commit | a499d1b980be1eb2bd6ccfa07b1d87c02fcb1343 (patch) | |
| tree | 9c81b8f52ee76c9c756209ed1c549eb7a811b9f1 /include | |
| parent | 4405180546bce4b4237f1a23c0bc5bcc5d7bb3a7 (diff) | |
Convert WINDOW flags to scoped enum
Change-Id: I952fcc940cfe4daca5a810a406a2b8ecd3bd6f47
Reviewed-on: https://gerrit.libreoffice.org/25582
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/rc.h | 24 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 7 |
2 files changed, 18 insertions, 13 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index ff8ea1347cb8..eb531bf60d16 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -38,16 +38,20 @@ namespace o3tl { template<> struct typed_flags<RSWND> : is_typed_flags<RSWND, 0x03> {}; } -#define WINDOW_XYMAPMODE 0x0001 -#define WINDOW_X 0x0002 -#define WINDOW_Y 0x0004 -#define WINDOW_WHMAPMODE 0x0008 -#define WINDOW_WIDTH 0x0010 -#define WINDOW_HEIGHT 0x0020 -#define WINDOW_TEXT 0x0040 -#define WINDOW_HELPTEXT 0x0080 -#define WINDOW_QUICKTEXT 0x0100 -#define WINDOW_HELPID 0x0200 +enum class RscWindowFlags { + XYMapMode = 0x0001, + X = 0x0002, + Y = 0x0004, + WHMapMode = 0x0008, + Width = 0x0010, + Height = 0x0020, + Text = 0x0040, + QuickText = 0x0100, + HelpId = 0x0200 +}; +namespace o3tl { + template<> struct typed_flags<RscWindowFlags> : is_typed_flags<RscWindowFlags, 0x07> {}; +} // For "FixedImage" resource: #define RSC_FIXEDIMAGE_IMAGE 0x0001 diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index dea60a940d06..62e8c6448a5e 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -466,12 +466,13 @@ class LifecycleTest; namespace svt { class PopupWindowControllerImpl; } enum class RSWND; +enum class RscWindowFlags; struct WindowResHeader { - sal_uLong nObjMask; - OString aHelpId; - RSWND nRSStyle; + RscWindowFlags nObjMask; + OString aHelpId; + RSWND nRSStyle; }; enum class WindowHitTest { |