From 0e30af6fdc496ee1b935d68e979aa63729cef878 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 2 Oct 2015 11:37:49 +0200 Subject: convert SAL_FRAME_STYLE to scoped enum Change-Id: Ic3f7fddcea36c18ffe43c4c633d415f596a58cbc Reviewed-on: https://gerrit.libreoffice.org/19094 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- vcl/inc/win/salinst.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/inc/win/salinst.h') diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index 6c413143f555..7bdf3fc5d112 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -46,8 +46,8 @@ public: WinSalInstance(); virtual ~WinSalInstance(); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ) SAL_OVERRIDE; - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr 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; virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE; @@ -85,7 +85,7 @@ public: static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo); }; -SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uIntPtr nSalFrameStyle ); +SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, SalFrameStyleFlags nSalFrameStyle ); SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ); HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild ); void ImplSalStartTimer( sal_uIntPtr nMS, bool bMutex = false ); -- cgit v1.2.3