diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:14:30 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:14:30 +0000 |
| commit | 8e33776acf176d3fbdb3f0448336db47ebab13a0 (patch) | |
| tree | 32d59129c28f87c0109d6ac992c18f6c8aab51ed /vcl | |
| parent | d30e8d1ed815ccd4d941865d1b2fe30408a86217 (diff) | |
INTEGRATION: CWS geordi2q01 (1.16.128); FILE MERGED
2003/08/18 13:37:55 hr 1.16.128.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/inc/saldisp.hxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index 051f664ec1b8..e922419405b6 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: saldisp.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: vg $ $Date: 2003-04-11 17:31:38 $ + * last change: $Author: hjs $ $Date: 2003-08-18 15:14:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -274,6 +274,7 @@ class SalXLib int nStateOfYield_; BOOL bWasXError_; BOOL bIgnoreXErrors_; + int nIgnoreErrorLevel; int nFDs_; fd_set aReadFDS_; @@ -295,6 +296,8 @@ public: void Remove( int fd ); void XError( Display *pDisp, XErrorEvent *pEvent ); + inline void PushErrorTrap() { nIgnoreErrorLevel++; } + inline void PopErrorTrap() { nIgnoreErrorLevel--; } inline BOOL WasXError() const { return bWasXError_; } inline BOOL GetIgnoreXErrors() const { return bIgnoreXErrors_; } inline void SetIgnoreXErrors( BOOL b ) @@ -326,6 +329,11 @@ class SalConverterCache; DECLARE_LIST( SalFontCache, ExtendedFontStruct* ) +extern "C" { + struct SnDisplay; + struct SnLauncheeContext; +}; + class SalDisplay { STDAPI( SalDisplay ); @@ -403,6 +411,9 @@ class SalDisplay bool m_bXinerama; std::vector< Rectangle > m_aXineramaScreens; + struct SnDisplay *m_pSnDisplay; + struct SnLauncheeContext *m_pSnLauncheeContext; + void DestroyFontCache(); long Dispatch( XEvent *pEvent ); void InitXinerama(); |