From 9e28cc8ca79b5c42955867a62e89faf8facc5e80 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 23 Jul 2015 13:19:40 +0200 Subject: convert WindowAlign to scoped enum Change-Id: I028d108b3a83bd5541d873c4d03b87339cd3be52 --- include/tools/wintypes.hxx | 4 +++- include/vcl/splitwin.hxx | 2 +- include/vcl/toolbox.hxx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index bfd038ee6e6c..01a04d921803 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -285,11 +285,13 @@ WinBits const WB_EXT_DOCMODIFIED = 0x00000002; // WindowAlign -enum WindowAlign { WINDOWALIGN_LEFT, WINDOWALIGN_TOP, WINDOWALIGN_RIGHT, WINDOWALIGN_BOTTOM }; +enum class WindowAlign { Left, Top, Right, Bottom }; + enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_BOTTOM, IMAGEALIGN_LEFT_TOP, IMAGEALIGN_LEFT_BOTTOM, IMAGEALIGN_TOP_LEFT, IMAGEALIGN_TOP_RIGHT, IMAGEALIGN_RIGHT_TOP, IMAGEALIGN_RIGHT_BOTTOM, IMAGEALIGN_BOTTOM_LEFT, IMAGEALIGN_BOTTOM_RIGHT, IMAGEALIGN_CENTER }; + enum class SymbolAlign { LEFT, RIGHT }; // ButtonDialog-Types diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 8918d4235b10..5a2711a486dd 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -184,7 +184,7 @@ public: sal_uInt16 GetItemCount( sal_uInt16 nSetId = 0 ) const; bool IsItemValid( sal_uInt16 nId ) const; - void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); + void SetAlign( WindowAlign eNewAlign = WindowAlign::Top ); WindowAlign GetAlign() const { return meAlign; } bool IsHorizontal() const { return mbHorz; } diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index f0541cd0fed0..bda8d0b4acc1 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -352,7 +352,7 @@ public: void SetToolboxButtonSize( ToolBoxButtonSize eSize ); ToolBoxButtonSize GetToolboxButtonSize() const; - void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); + void SetAlign( WindowAlign eNewAlign = WindowAlign::Top ); WindowAlign GetAlign() const { return meAlign; } bool IsHorizontal() const { return mbHorz; } -- cgit