diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/rsc/rsc-vcl-shared-types.hxx | 22 | ||||
-rw-r--r-- | include/vcl/combobox.hxx | 2 | ||||
-rw-r--r-- | include/vcl/window.hxx | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index 1da829d46c15..66c12919ada9 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -118,14 +118,20 @@ enum class SymbolType : sal_uInt16 // Border-Styles fuer SetBorder() -typedef sal_uInt16 WindowBorderStyle; - -#define WINDOW_BORDER_NORMAL ((WindowBorderStyle)0x0001) -#define WINDOW_BORDER_MONO ((WindowBorderStyle)0x0002) -#define WINDOW_BORDER_MENU ((WindowBorderStyle)0x0010) -#define WINDOW_BORDER_NWF ((WindowBorderStyle)0x0020) -#define WINDOW_BORDER_NOBORDER ((WindowBorderStyle)0x1000) -#define WINDOW_BORDER_REMOVEBORDER ((WindowBorderStyle)0x2000) +enum class WindowBorderStyle : sal_uInt16 +{ + NONE = 0x0000, + NORMAL = 0x0001, + MONO = 0x0002, + MENU = 0x0010, + NWF = 0x0020, + NOBORDER = 0x1000, + REMOVEBORDER = 0x2000 +}; +namespace o3tl +{ + template<> struct typed_flags<WindowBorderStyle> : is_typed_flags<WindowBorderStyle, 0x3033> {}; +} #define KEY_CODE ((sal_uInt16)0x0FFF) diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 3928a4cb1be6..2da1f1b1e2c8 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -155,7 +155,7 @@ public: void EnableUserDraw( bool bUserDraw ); void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false ); - void SetBorderStyle( sal_uInt16 nBorderStyle ); + void SetBorderStyle( WindowBorderStyle nBorderStyle ); void SetSeparatorPos( sal_Int32 n = COMBOBOX_ENTRY_NOTFOUND ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index cb7dbdefa17d..da012ca13673 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -743,8 +743,8 @@ public: void EnableAllResize( bool bEnable = true ); - void SetBorderStyle( sal_uInt16 nBorderStyle ); - sal_uInt16 GetBorderStyle() const; + void SetBorderStyle( WindowBorderStyle nBorderStyle ); + WindowBorderStyle GetBorderStyle() const; void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; Size CalcWindowSize( const Size& rOutSz ) const; |