diff options
| author | Patrick Luby <pluby@openoffice.org> | 2000-11-15 20:49:28 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2000-11-15 20:49:28 +0000 |
| commit | baf881cb9309779ea1f211f07461f64f5f4164e6 (patch) | |
| tree | bce734e9de7afed25f01f9ca9752bae67fe15dde /vcl | |
| parent | 11eb46e36d5a874d729a23aeaf8d8e41c118b321 (diff) | |
Added access to SalFrameData and SalInstanceData structs for Objective-C code.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/aqua/inc/salframe.h | 13 | ||||
| -rw-r--r-- | vcl/aqua/inc/salinst.h | 20 |
2 files changed, 22 insertions, 11 deletions
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h index 080445517869..b252d6625269 100644 --- a/vcl/aqua/inc/salframe.h +++ b/vcl/aqua/inc/salframe.h @@ -2,9 +2,9 @@ * * $RCSfile: salframe.h,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: pluby $ $Date: 2000-11-01 22:12:26 $ + * last change: $Author: pluby $ $Date: 2000-11-15 21:49:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ #include <VCLWindow.h> #endif -#ifdef __cplusplus +#if SUPD >= 612 #ifndef _SV_SYSDATA_HXX #include <sysdata.hxx> @@ -82,14 +82,13 @@ struct SalFrameData { -public: VCLWINDOW mhWnd; // Window handle SalGraphics* mpGraphics; // current frame graphics SalFrame* mpNextFrame; // pointer to next frame void* mpInst; // instance handle for callback SALFRAMEPROC mpProc; // callback proc - SystemEnvData maSysData; // system data - SalFrameState maState; // frame state + struct SystemEnvData maSysData; // system data + struct SalFrameState maState; // frame state int mnShowState; // show state long mnWidth; // client width in pixeln long mnHeight; // client height in pixeln @@ -117,6 +116,6 @@ public: BOOL mbCompositionMode; // TRUE: Wir befinden uns im Composition-Modus BOOL mbCandidateMode; // TRUE: Wir befinden uns im Candidate-Modus }; -#endif // __cplusplus +#endif // SUPD >= 612 #endif // _SV_SALFRAME_H diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h index 1db8930f82cb..e4b5f34fe338 100644 --- a/vcl/aqua/inc/salinst.h +++ b/vcl/aqua/inc/salinst.h @@ -2,9 +2,9 @@ * * $RCSfile: salinst.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: pluby $ $Date: 2000-11-01 22:12:27 $ + * last change: $Author: pluby $ $Date: 2000-11-15 21:49:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,9 @@ #include <VCLWindow.h> #endif -#ifdef __cplusplus +#if SUPD >= 612 + +#ifdef __cplusplus #ifdef _VOS_NO_NAMESPACE class OMutex; @@ -82,6 +84,16 @@ class SalInstance; class SalFrame; class SalObject; +#else // __cplusplus + +#define OMutex void +#define SalYieldMutex void +#define SalInstance void +#define SalFrame void +#define SalObject void + +#endif // __cplusplus + // ------------------- // - SalInstanceData - // ------------------- @@ -101,6 +113,6 @@ public: USHORT mnYieldWaitCount; // Wait-Count }; -#endif // __cplusplus +#endif // SUPD >= 612 #endif // _SV_SALINST_H |