diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:48:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:48:27 +0000 |
| commit | 43a2e647036efb7358765f7506b381663a60b764 (patch) | |
| tree | 6f2fa93afbbe93d1b8d1f8b0c46e3f08f0ed93db /vcl | |
| parent | 937aaa6c7a7536f6cc83041a23ac6f045053d0c2 (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.10.10); FILE MERGED
2007/11/01 10:33:21 pl 1.10.10.3: #i82621# change AquaSalObject to NSClipView implementation
2007/10/30 14:45:48 pl 1.10.10.2: #i82621# implement at least one clip rectangle on AquaSalObject
2007/10/15 11:11:25 pl 1.10.10.1: #i82621# initial implementation of SalObject for MacOSX aqua
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/aqua/inc/salobj.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h index 1bc3336d43df..7bd03f724ee2 100644 --- a/vcl/aqua/inc/salobj.h +++ b/vcl/aqua/inc/salobj.h @@ -4,9 +4,9 @@ * * $RCSfile: salobj.h,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2007-10-09 15:10:18 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:48:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,23 +56,25 @@ class AquaSalObject : public SalObject { public: AquaSalFrame* mpFrame; // parent frame - AquaSalObject* mpNextObject; // pointer to next object - void* mpInst; // instance handle for callback - SALOBJECTPROC mpProc; // callback proc + NSClipView* mpClipView; + SystemEnvData maSysData; + long mnClipX; + long mnClipY; + long mnClipWidth; + long mnClipHeight; + bool mbClip; -// HWND mhWnd; // Window handle -// HWND mhWndChild; // Child Window handle -// HWND mhLastFocusWnd; // Child-Window, welches als letztes den Focus hatte -// SystemChildData maSysData; // SystemEnvData -// RGNDATA* mpClipRgnData; // ClipRegion-Data -// RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data -// RECT* mpNextClipRect; // Naechstes ClipRegion-Rect -// BOOL mbFirstClipRect; // Flag for first cliprect to insert -// WinSalObject* mpNextObject; // pointer to next object + long mnX; + long mnY; + long mnWidth; + long mnHeight; - AquaSalObject(); + void setClippedPosSize(); + + + AquaSalObject( AquaSalFrame* pFrame ); virtual ~AquaSalObject(); virtual void ResetClipRegion(); @@ -87,8 +89,6 @@ public: virtual void SetBackground(); virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; - - virtual void SetCallback( void* pInst, SALOBJECTPROC pProc ); }; #endif // _SV_SALOBJ_H |