diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-14 16:17:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-16 06:42:38 +0000 |
| commit | 1938fd869b8226af00925caa7ac991618d35ee0c (patch) | |
| tree | 9d71af70e2dc9082dcc04e3bbc7f23127085ff39 /include | |
| parent | c2fc91664f71c447209d2cd29c0df1d7faba4927 (diff) | |
Convert RSWND to scoped enum
Change-Id: If6e5753ade8b096a4ba1c10b47c2360ff26d181f
Reviewed-on: https://gerrit.libreoffice.org/24993
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/rc.h | 12 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 5 |
2 files changed, 13 insertions, 4 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index 49f6ebdd58d9..211eb253faac 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -21,14 +21,22 @@ #define INCLUDED_TOOLS_RC_H #include <tools/rcid.h> +#include <o3tl/typed_flags_set.hxx> // Defines for all "Window" resources. // (Here are all window styles that are not in WinBits) #define RSC_EXTRAMAPUNIT 0xFFFF // do not change that value! -#define RSWND_DISABLED 0x01 -#define RSWND_CLIENTSIZE 0x02 +// Attributes in *.src files +enum class RSWND { + NONE = 0x00, + DISABLED = 0x01, // "Disable" attribute + CLIENTSIZE = 0x02 // "OutputSize" attribute +}; +namespace o3tl { + template<> struct typed_flags<RSWND> : is_typed_flags<RSWND, 0x03> {}; +} #define WINDOW_XYMAPMODE 0x0001 #define WINDOW_X 0x0002 diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 9f4a8dc79082..d9f9d915e5bf 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -465,12 +465,13 @@ class MenuFloatingWindow; class LifecycleTest; namespace svt { class PopupWindowControllerImpl; } +enum class RSWND; struct WindowResHeader { sal_uLong nObjMask; - OString aHelpId; - sal_uLong nRSStyle; + OString aHelpId; + RSWND nRSStyle; }; namespace vcl { |