summaryrefslogtreecommitdiff
path: root/vcl/inc/osx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-02 11:37:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-05 06:52:22 +0000
commit0e30af6fdc496ee1b935d68e979aa63729cef878 (patch)
tree455c406d192639a69fb0615476eb1d6a6b8c4172 /vcl/inc/osx
parent5ffa83a2b39cc77b36ef6f2ecc46ae5482e3e68c (diff)
convert SAL_FRAME_STYLE to scoped enum
Change-Id: Ic3f7fddcea36c18ffe43c4c633d415f596a58cbc Reviewed-on: https://gerrit.libreoffice.org/19094 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/inc/osx')
-rw-r--r--vcl/inc/osx/salframe.h4
-rw-r--r--vcl/inc/osx/salinst.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index f426200c7d01..52a8ac378b0c 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -70,7 +70,7 @@ public:
bool mbSized:1;
bool mbPresentation:1;
- sal_uLong mnStyle;
+ SalFrameStyleFlags mnStyle;
unsigned int mnStyleMask; // our style mask from NSWindow creation
sal_uInt64 mnLastEventTime;
@@ -102,7 +102,7 @@ public:
@throws std::runtime_error in case window creation fails
*/
- AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle );
+ AquaSalFrame( SalFrame* pParent, SalFrameStyleFlags salFrameStyle );
virtual ~AquaSalFrame();
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index ba0eb12ad75c..2d9895778cb4 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -80,8 +80,8 @@ public:
AquaSalInstance();
virtual ~AquaSalInstance();
- virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
- virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
+ virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
+ virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
virtual void DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData,
bool bShow = true ) SAL_OVERRIDE;