diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-02 13:35:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-02 13:35:47 +0000 |
| commit | b4c83f7ec52a869c615462143f4fa3a38354d1c8 (patch) | |
| tree | 13a38936157e85aff3dd7afa4e9b944885c64e9d /vcl/unx/inc | |
| parent | c6088a38603d0512cb6d22067d47fe897d7e13de (diff) | |
INTEGRATION: CWS canvas02 (1.28.56); FILE MERGED
2005/10/09 07:45:23 thb 1.28.56.2: RESYNC: (1.28-1.30); FILE MERGED
2005/07/28 15:00:30 thb 1.28.56.1: Join from cws_src680_glcanvas: needed the SystemChildWindow stuff also here
Diffstat (limited to 'vcl/unx/inc')
| -rw-r--r-- | vcl/unx/inc/saldisp.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index ce9b52cb85c7..b6ea095518dc 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -4,9 +4,9 @@ * * $RCSfile: saldisp.hxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2005-11-01 13:00:19 $ + * last change: $Author: kz $ $Date: 2005-11-02 14:35:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -367,6 +367,7 @@ protected: bool m_bXinerama; std::vector< Rectangle > m_aXineramaScreens; std::list<SalFrame*> m_aFrames; + std::list<SalObject*> m_aSalObjects; struct SnDisplay *m_pSnDisplay; struct SnLauncheeContext *m_pSnLauncheeContext; @@ -474,10 +475,12 @@ public: bool IsXinerama() const { return m_bXinerama; } const std::vector< Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; } - const std::list< SalFrame* >& getFrames() + const std::list< SalFrame* >& getFrames() const { return m_aFrames; } BOOL IsNumLockFromXS() const { return bNumLockFromXS_; } + + std::list< SalObject* >& getSalObjects() { return m_aSalObjects; } }; // -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= |