diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-07-15 08:47:14 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-07-19 17:12:31 +0200 |
| commit | f0d6fa07cc17c6942644196671b7c94d522d4e14 (patch) | |
| tree | 2beed792c1305b997e5b88b7d03bd71509140d32 /include | |
| parent | 903baa666b64e0576f35242970f3abe80723fbc1 (diff) | |
Use sal_uInt32 consistently for WindowStateData::SetMask and related
Change-Id: I722828785a861065a69a1d83bc6e40517b164102
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/syswin.hxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 94ecbadf05ee..c7d816ddde07 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -46,26 +46,26 @@ class VclContainer; // - WindowStateData - -#define WINDOWSTATE_MASK_X ((sal_uLong)0x00000001) -#define WINDOWSTATE_MASK_Y ((sal_uLong)0x00000002) -#define WINDOWSTATE_MASK_WIDTH ((sal_uLong)0x00000004) -#define WINDOWSTATE_MASK_HEIGHT ((sal_uLong)0x00000008) -#define WINDOWSTATE_MASK_STATE ((sal_uLong)0x00000010) -#define WINDOWSTATE_MASK_MINIMIZED ((sal_uLong)0x00000020) -#define WINDOWSTATE_MASK_MAXIMIZED_X ((sal_uLong)0x00000100) -#define WINDOWSTATE_MASK_MAXIMIZED_Y ((sal_uLong)0x00000200) -#define WINDOWSTATE_MASK_MAXIMIZED_WIDTH ((sal_uLong)0x00000400) -#define WINDOWSTATE_MASK_MAXIMIZED_HEIGHT ((sal_uLong)0x00000800) +#define WINDOWSTATE_MASK_X ((sal_uInt32)0x00000001) +#define WINDOWSTATE_MASK_Y ((sal_uInt32)0x00000002) +#define WINDOWSTATE_MASK_WIDTH ((sal_uInt32)0x00000004) +#define WINDOWSTATE_MASK_HEIGHT ((sal_uInt32)0x00000008) +#define WINDOWSTATE_MASK_STATE ((sal_uInt32)0x00000010) +#define WINDOWSTATE_MASK_MINIMIZED ((sal_uInt32)0x00000020) +#define WINDOWSTATE_MASK_MAXIMIZED_X ((sal_uInt32)0x00000100) +#define WINDOWSTATE_MASK_MAXIMIZED_Y ((sal_uInt32)0x00000200) +#define WINDOWSTATE_MASK_MAXIMIZED_WIDTH ((sal_uInt32)0x00000400) +#define WINDOWSTATE_MASK_MAXIMIZED_HEIGHT ((sal_uInt32)0x00000800) #define WINDOWSTATE_MASK_POS (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y) #define WINDOWSTATE_MASK_ALL (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT | WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y | WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED) -#define WINDOWSTATE_STATE_NORMAL ((sal_uLong)0x00000001) -#define WINDOWSTATE_STATE_MINIMIZED ((sal_uLong)0x00000002) -#define WINDOWSTATE_STATE_MAXIMIZED ((sal_uLong)0x00000004) -#define WINDOWSTATE_STATE_ROLLUP ((sal_uLong)0x00000008) -#define WINDOWSTATE_STATE_MAXIMIZED_HORZ ((sal_uLong)0x00000010) -#define WINDOWSTATE_STATE_MAXIMIZED_VERT ((sal_uLong)0x00000020) -#define WINDOWSTATE_STATE_SYSTEMMASK ((sal_uLong)0x0000FFFF) +#define WINDOWSTATE_STATE_NORMAL ((sal_uInt32)0x00000001) +#define WINDOWSTATE_STATE_MINIMIZED ((sal_uInt32)0x00000002) +#define WINDOWSTATE_STATE_MAXIMIZED ((sal_uInt32)0x00000004) +#define WINDOWSTATE_STATE_ROLLUP ((sal_uInt32)0x00000008) +#define WINDOWSTATE_STATE_MAXIMIZED_HORZ ((sal_uInt32)0x00000010) +#define WINDOWSTATE_STATE_MAXIMIZED_VERT ((sal_uInt32)0x00000020) +#define WINDOWSTATE_STATE_SYSTEMMASK ((sal_uInt32)0x0000FFFF) class VCL_PLUGIN_PUBLIC WindowStateData { @@ -88,7 +88,7 @@ public: mnMaximizedX = mnMaximizedY = mnMaximizedWidth = mnMaximizedHeight = 0; } - void SetMask( sal_uLong nValidMask ) { mnValidMask = nValidMask; } + void SetMask( sal_uInt32 nValidMask ) { mnValidMask = nValidMask; } sal_uInt32 GetMask() const { return mnValidMask; } void SetX( int nX ) { mnX = nX; } @@ -223,7 +223,7 @@ public: const Size& GetMaxOutputSizePixel() const; void SetWindowState(const OString& rStr); - OString GetWindowState(sal_uLong nMask = WINDOWSTATE_MASK_ALL) const; + OString GetWindowState(sal_uInt32 nMask = WINDOWSTATE_MASK_ALL) const; void SetMenuBar(MenuBar* pMenuBar, const css::uno::Reference<css::frame::XFrame>& rFrame = css::uno::Reference<css::frame::XFrame>()); MenuBar* GetMenuBar() const { return mpMenuBar; } |