diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-02 12:33:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-02 12:33:42 +0000 |
| commit | b44cc50a1e566427ccd76f2c0a77e97fa5a94724 (patch) | |
| tree | bbdd388dae87e40828a11a9599ae795f8ca9f1ba /vcl/unx/inc | |
| parent | d7f77f24c575ed436a2271b3950024b9d31972e1 (diff) | |
INTEGRATION: CWS canvas02 (1.3.464); FILE MERGED
2005/10/09 07:46:48 thb 1.3.464.2: RESYNC: (1.3-1.4); FILE MERGED
2005/07/28 15:00:31 thb 1.3.464.1: Join from cws_src680_glcanvas: needed the SystemChildWindow stuff also here
Diffstat (limited to 'vcl/unx/inc')
| -rw-r--r-- | vcl/unx/inc/salobj.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h index 19f70ec1c8a0..d394b192b27b 100644 --- a/vcl/unx/inc/salobj.h +++ b/vcl/unx/inc/salobj.h @@ -4,9 +4,9 @@ * * $RCSfile: salobj.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:45:50 $ + * last change: $Author: kz $ $Date: 2005-11-02 13:33:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,16 +42,13 @@ #ifndef _SV_SYSDATA_HXX #include <sysdata.hxx> #endif -#ifndef _LIST_HXX -#include <tools/list.hxx> -#endif #ifndef _SV_SALOBJ_HXX #include <salobj.hxx> #endif -class X11SalObject; - -DECLARE_LIST( SalObjectList, X11SalObject* ); +#ifndef _VCL_DLLAPI_H +#include "dllapi.h" +#endif class SalClipRegion { @@ -87,18 +84,15 @@ private: class X11SalObject : public SalObject { public: - static SalObjectList aAllObjects; - SystemChildData maSystemChildData; + SalFrame* mpParent; XLIB_Window maPrimary; XLIB_Window maSecondary; SalClipRegion maClipRegion; - void* mpInst; - SALOBJECTPROC mpProc; - SalObject* mpSalObject; BOOL mbVisible; - static long Dispatch( XEvent* pEvent ); + static VCL_DLLPUBLIC long Dispatch( XEvent* pEvent ); + static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData ); X11SalObject(); virtual ~X11SalObject(); |