diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:44:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:44:25 +0000 |
| commit | 0301fa1eb3e7ba513f3ffee3694cef6a4bed900f (patch) | |
| tree | 427dfb5260b9f81c25f0276d51888b5349bfce4d /vcl/os2/inc | |
| parent | 152e073b5e5d5bb36760a794d1a2b91b5e9e22d2 (diff) | |
INTEGRATION: CWS os2port02 (1.3.2); FILE MERGED
2007/10/08 14:28:02 obr 1.3.2.2: RESYNC: (1.3-1.4); FILE MERGED
2007/09/30 13:04:32 ydario 1.3.2.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'vcl/os2/inc')
| -rw-r--r-- | vcl/os2/inc/salframe.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vcl/os2/inc/salframe.h b/vcl/os2/inc/salframe.h index fb5894e83338..a9f23c78d927 100644 --- a/vcl/os2/inc/salframe.h +++ b/vcl/os2/inc/salframe.h @@ -4,9 +4,9 @@ * * $RCSfile: salframe.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2007-09-25 10:04:41 $ + * last change: $Author: hr $ $Date: 2007-11-02 12:44:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,15 +37,15 @@ #define _SV_SALFRAME_H #ifndef _SV_SV_H -#include <sv.h> +#include <vcl/sv.h> #endif #ifndef _SV_SYSDATA_HXX -#include <sysdata.hxx> +#include <vcl/sysdata.hxx> #endif #ifndef _SV_SALFRAME_HXX -#include <salframe.hxx> +#include <vcl/salframe.hxx> #endif @@ -148,7 +148,7 @@ public: virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); virtual BOOL GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( BOOL bFullScreen ); + virtual void ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ); virtual void StartPresentation( BOOL bStart ); virtual void SetAlwaysOnTop( BOOL bOnTop ); virtual void ToTop( USHORT nFlags ); @@ -171,6 +171,10 @@ public: virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetBackgroundBitmap( SalBitmap* ); + virtual void ResetClipRegion(); + virtual void BeginSetClipRegion( ULONG nRects ); + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); + virtual void EndSetClipRegion(); }; |