summaryrefslogtreecommitdiff
path: root/vcl/inc
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
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')
-rw-r--r--vcl/inc/android/androidinst.hxx4
-rw-r--r--vcl/inc/headless/svpframe.hxx4
-rw-r--r--vcl/inc/headless/svpinst.hxx4
-rw-r--r--vcl/inc/ios/iosinst.hxx4
-rw-r--r--vcl/inc/osx/salframe.h4
-rw-r--r--vcl/inc/osx/salinst.h4
-rw-r--r--vcl/inc/salframe.hxx61
-rw-r--r--vcl/inc/salinst.hxx5
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx26
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx4
-rw-r--r--vcl/inc/unx/salframe.h20
-rw-r--r--vcl/inc/unx/salinst.h4
-rw-r--r--vcl/inc/win/salframe.h2
-rw-r--r--vcl/inc/win/salinst.h6
14 files changed, 80 insertions, 72 deletions
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index 21c65834d947..764d0cfc4eed 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -33,8 +33,8 @@ public:
// frame management
void GetWorkArea( Rectangle& rRect );
- SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle );
- SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
+ SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
+ SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle );
// mainloop pieces
virtual bool AnyInput( VclInputFlags nType );
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 74efe1991559..16ff7e25445b 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -41,7 +41,7 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
SvpSalInstance* m_pInstance;
SvpSalFrame* m_pParent; // pointer to parent frame
std::list< SvpSalFrame* > m_aChildren; // List of child frames
- sal_uLong m_nStyle;
+ SalFrameStyleFlags m_nStyle;
bool m_bVisible;
bool m_bTopDown;
#ifndef IOS
@@ -62,7 +62,7 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
public:
SvpSalFrame( SvpSalInstance* pInstance,
SalFrame* pParent,
- sal_uLong nSalFrameStyle,
+ SalFrameStyleFlags nSalFrameStyle,
bool bTopDown,
basebmp::Format nScanlineFormat,
SystemParentData* pSystemParent = NULL );
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index e33527fd6b31..e1bf136452c3 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -115,8 +115,8 @@ public:
bool CheckTimeout( bool bExecuteTimers = true );
// Frame
- 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;
// Object (System Child Window)
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index 4a1648a06ab2..1693986fbacd 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -40,8 +40,8 @@ public:
virtual SalSystem* CreateSalSystem() SAL_OVERRIDE;
void GetWorkArea( Rectangle& rRect );
- SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
- SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
+ SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
+ SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
SalFrame *getFocusFrame() const;
};
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;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 26d275ba4a19..da95a5ab73d8 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -35,6 +35,7 @@
#include <vcl/keycod.hxx>
#include <vcl/window.hxx>
#include <vcl/vclptr.hxx>
+#include <o3tl/typed_flags_set.hxx>
// complete vcl::Window for SalFrame::CallCallback under -fsanitize=function
@@ -54,33 +55,39 @@ struct SystemEnvData;
#define SAL_FRAME_TOTOP_GRABFOCUS_ONLY ((sal_uInt16)0x0008)
// SalFrame styles
-#define SAL_FRAME_STYLE_DEFAULT ((sal_uLong)0x00000001)
-#define SAL_FRAME_STYLE_MOVEABLE ((sal_uLong)0x00000002)
-#define SAL_FRAME_STYLE_SIZEABLE ((sal_uLong)0x00000004)
-#define SAL_FRAME_STYLE_CLOSEABLE ((sal_uLong)0x00000008)
-
-// no shadow effect on Windows XP
-#define SAL_FRAME_STYLE_NOSHADOW ((sal_uLong)0x00000010)
-// indicate tooltip windows, so they can always be topmost
-#define SAL_FRAME_STYLE_TOOLTIP ((sal_uLong)0x00000020)
-// windows without windowmanager decoration, this typically only applies to floating windows
-#define SAL_FRAME_STYLE_OWNERDRAWDECORATION ((sal_uLong)0x00000040)
-// dialogs
-#define SAL_FRAME_STYLE_DIALOG ((sal_uLong)0x00000080)
-// partial fullscreen: fullscreen on one monitor of a multimonitor display
-#define SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ((sal_uLong)0x00800000)
-// plugged system child window
-#define SAL_FRAME_STYLE_PLUG ((sal_uLong)0x10000000)
-// system child window inside another SalFrame
-#define SAL_FRAME_STYLE_SYSTEMCHILD ((sal_uLong)0x08000000)
-// floating window
-#define SAL_FRAME_STYLE_FLOAT ((sal_uLong)0x20000000)
-// floating window that needs to be focusable
-#define SAL_FRAME_STYLE_FLOAT_FOCUSABLE ((sal_uLong)0x04000000)
-// toolwindows should be painted with a smaller decoration
-#define SAL_FRAME_STYLE_TOOLWINDOW ((sal_uLong)0x40000000)
-// the window containing the intro bitmap, aka splashscreen
-#define SAL_FRAME_STYLE_INTRO ((sal_uLong)0x80000000)
+enum class SalFrameStyleFlags
+{
+ NONE = 0x00000000,
+ DEFAULT = 0x00000001,
+ MOVEABLE = 0x00000002,
+ SIZEABLE = 0x00000004,
+ CLOSEABLE = 0x00000008,
+ // no shadow effect on Windows XP
+ NOSHADOW = 0x00000010,
+ // indicate tooltip windows, so they can always be topmost
+ TOOLTIP = 0x00000020,
+ // windows without windowmanager decoration, this typically only applies to floating windows
+ OWNERDRAWDECORATION = 0x00000040,
+ // dialogs
+ DIALOG = 0x00000080,
+ // partial fullscreen: fullscreen on one monitor of a multimonitor display
+ PARTIAL_FULLSCREEN = 0x00800000,
+ // plugged system child window
+ PLUG = 0x10000000,
+ // system child window inside another SalFrame
+ SYSTEMCHILD = 0x08000000,
+ // floating window
+ FLOAT = 0x20000000,
+ // floating window that needs to be focusable
+ FLOAT_FOCUSABLE = 0x04000000,
+ // toolwindows should be painted with a smaller decoration
+ TOOLWINDOW = 0x40000000,
+ // the window containing the intro bitmap, aka splashscreen
+ INTRO = 0x00000100,
+};
+namespace o3tl {
+ template<> struct typed_flags<SalFrameStyleFlags> : is_typed_flags<SalFrameStyleFlags, 0x748001ff> {};
+};
// - extended frame style -
// - (sal equivalent to extended WinBits) -
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 63e707e9b052..ec429b99e00c 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -57,6 +57,7 @@ struct SystemGraphicsData;
struct SystemWindowData;
class Menu;
enum class VclInputFlags;
+enum class SalFrameStyleFlags;
class VCL_PLUGIN_PUBLIC SalInstance
{
@@ -72,8 +73,8 @@ public:
// Frame
// DisplayName for Unix ???
- virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) = 0;
- virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) = 0;
+ virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) = 0;
+ virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) = 0;
virtual void DestroyFrame( SalFrame* pFrame ) = 0;
// Object (System Child Window)
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index f465c950adb3..102f894c64d4 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -180,7 +180,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
GdkWindow* m_pForeignTopLevel;
GdkNativeWindow m_aForeignTopLevelWindow;
Pixmap m_hBackgroundPixmap;
- sal_uLong m_nStyle;
+ SalFrameStyleFlags m_nStyle;
SalExtStyle m_nExtStyle;
GtkSalFrame* m_pParent;
std::list< GtkSalFrame* > m_aChildren;
@@ -201,8 +201,8 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
bool m_bSendModChangeOnRelease;
bool m_bWindowIsGtkPlug;
bool m_bSetFocusOnMap;
- OUString m_aTitle;
- OUString m_sWMClass;
+ OUString m_aTitle;
+ OUString m_sWMClass;
IMHandler* m_pIMHandler;
@@ -229,7 +229,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
#endif
guint m_nWatcherId;
- void Init( SalFrame* pParent, sal_uLong nStyle );
+ void Init( SalFrame* pParent, SalFrameStyleFlags nStyle );
void Init( SystemParentData* pSysData );
void InitCommon();
void InvalidateGraphics();
@@ -282,20 +282,20 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
bool isFloatGrabWindow() const
{
return
- (m_nStyle & SAL_FRAME_STYLE_FLOAT) && // only a float can be floatgrab
- !(m_nStyle & SAL_FRAME_STYLE_TOOLTIP) && // tool tips are not
- !(m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && // toolbars are also not
- !(m_nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE); // focusable floats are not
+ (m_nStyle & SalFrameStyleFlags::FLOAT) && // only a float can be floatgrab
+ !(m_nStyle & SalFrameStyleFlags::TOOLTIP) && // tool tips are not
+ !(m_nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) && // toolbars are also not
+ !(m_nStyle & SalFrameStyleFlags::FLOAT_FOCUSABLE); // focusable floats are not
}
bool isChild( bool bPlug = true, bool bSysChild = true )
{
- sal_uLong nMask = 0;
+ SalFrameStyleFlags nMask = SalFrameStyleFlags::NONE;
if( bPlug )
- nMask |= SAL_FRAME_STYLE_PLUG;
+ nMask |= SalFrameStyleFlags::PLUG;
if( bSysChild )
- nMask |= SAL_FRAME_STYLE_SYSTEMCHILD;
- return (m_nStyle & nMask) != 0;
+ nMask |= SalFrameStyleFlags::SYSTEMCHILD;
+ return bool(m_nStyle & nMask);
}
//call gtk_window_resize if the current size differs and
@@ -327,7 +327,7 @@ public:
#if GTK_CHECK_VERSION(3,0,0)
basebmp::BitmapDeviceSharedPtr m_aFrame;
#endif
- GtkSalFrame( SalFrame* pParent, sal_uLong nStyle );
+ GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
GtkSalFrame( SystemParentData* pSysData );
guint m_nMenuExportId;
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 35b341c6b4f8..6b68a8493ca2 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -62,8 +62,8 @@ public:
void EnsureInit();
virtual void AfterAppInit() SAL_OVERRIDE;
- virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
- virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
+ virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
+ virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
virtual SalSystem* CreateSalSystem() SAL_OVERRIDE;
virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 5ae4a4ae5f12..e211fd16d5a1 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -87,7 +87,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public X11WindowProvider
int nWidth_; // client width
int nHeight_; // client height
Rectangle maRestorePosSize;
- sal_uIntPtr nStyle_;
+ SalFrameStyleFlags nStyle_;
SalExtStyle mnExtStyle;
bool bAlwaysOnTop_;
bool bViewable_;
@@ -115,9 +115,9 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public X11WindowProvider
// icon id
int mnIconID;
- OUString m_aTitle;
+ OUString m_aTitle;
- OUString m_sWMClass;
+ OUString m_sWMClass;
SystemEnvData maSystemChildData;
@@ -160,11 +160,11 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public X11WindowProvider
void updateWMClass();
public:
- X11SalFrame( SalFrame* pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent = NULL );
+ X11SalFrame( SalFrame* pParent, SalFrameStyleFlags nSalFrameStyle, SystemParentData* pSystemParent = NULL );
virtual ~X11SalFrame();
long Dispatch( XEvent *pEvent );
- void Init( sal_uIntPtr nSalFrameStyle, SalX11Screen nScreen = SalX11Screen( -1 ),
+ void Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nScreen = SalX11Screen( -1 ),
SystemParentData* pParentData = NULL, bool bUseGeometry = false );
SalDisplay* GetDisplay() const
@@ -181,16 +181,16 @@ public:
::Window GetForeignParent() const { return mhForeignParent; }
::Window GetStackingWindow() const { return mhStackingWindow; }
long Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
- sal_uIntPtr GetStyle() const { return nStyle_; }
+ SalFrameStyleFlags GetStyle() const { return nStyle_; }
- Cursor GetCursor() const { return hCursor_; }
- bool IsCaptured() const { return nCaptured_ == 1; }
+ Cursor GetCursor() const { return hCursor_; }
+ bool IsCaptured() const { return nCaptured_ == 1; }
#if !defined(__synchronous_extinput__)
void HandleExtTextEvent (XClientMessageEvent *pEvent);
#endif
bool IsOverrideRedirect() const;
- bool IsChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_PLUG|SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
- bool IsSysChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
+ bool IsChildWindow() const { return bool(nStyle_ & (SalFrameStyleFlags::PLUG|SalFrameStyleFlags::SYSTEMCHILD)); }
+ bool IsSysChildWindow() const { return bool(nStyle_ & (SalFrameStyleFlags::SYSTEMCHILD)); }
bool IsFloatGrabWindow() const;
SalI18N_InputContext* getInputContext() const { return mpInputContext; }
bool isMapped() const { return bMapped_; }
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index ea57496a7a1f..ebd3c36bc5cf 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -48,8 +48,8 @@ public:
X11SalInstance( SalYieldMutex* pMutex ) : SalGenericInstance( pMutex ), mpXLib(NULL) {}
virtual ~X11SalInstance();
- 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;
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 19819bd51f0c..68a2337657f1 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -52,7 +52,7 @@ public:
int mnFullScreenShowState; // fullscreen restore show state
UINT mnInputLang; // current Input Language
UINT mnInputCodePage; // current Input CodePage
- sal_uIntPtr mnStyle; // style
+ SalFrameStyleFlags mnStyle; // style
bool mbGraphics; // is Graphics used
bool mbCaption; // has window a caption
bool mbBorder; // has window a border
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 );