diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:02:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:02:54 +0000 |
| commit | 5d04173946c8d537d5ec48c00c8a15f1b371b97e (patch) | |
| tree | ed513b37798ac396654ff27b0aaffc44e1fa22ca /vcl | |
| parent | 34751f553ebd9534a44ff331ee546fc5747712c2 (diff) | |
INTEGRATION: CWS impresshydra (1.23.102); FILE MERGED
2006/08/11 15:07:47 pl 1.23.102.6: #i67721# finalize xinerama case
2006/08/10 08:41:46 pl 1.23.102.5: #i67721# move child frames crossscreen
2006/08/09 18:39:39 pl 1.23.102.4: #i67721# make gtk NWF multiscreen capable
2006/08/09 14:35:05 pl 1.23.102.3: #i67721# on the way to multiscreen support
2006/07/18 14:31:41 cl 1.23.102.2: #i12719# added support for multi monitors
2006/07/17 12:16:34 cl 1.23.102.1: #i12719# added multi monitor support for fullscreen presentation
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkframe.hxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx index 3e9f29019e3e..181eb4125606 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx @@ -4,9 +4,9 @@ * * $RCSfile: gtkframe.hxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: rt $ $Date: 2006-05-05 11:01:35 $ + * last change: $Author: kz $ $Date: 2006-10-06 10:02:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,7 +56,7 @@ #include <list> #include <vector> -class X11SalGraphics; +class GtkSalGraphics; class GtkSalDisplay; class GtkSalFrame : public SalFrame @@ -65,7 +65,7 @@ class GtkSalFrame : public SalFrame struct GraphicsHolder { - X11SalGraphics* pGraphics; + GtkSalGraphics* pGraphics; bool bInUse; GraphicsHolder() : pGraphics( NULL ), @@ -172,6 +172,7 @@ class GtkSalFrame : public SalFrame }; friend struct IMHandler; + int m_nScreen; GtkWindow* m_pWindow; GdkWindow* m_pForeignParent; GdkNativeWindow m_aForeignParentWindow; @@ -182,6 +183,7 @@ class GtkSalFrame : public SalFrame SalExtStyle m_nExtStyle; GtkFixed* m_pFixedContainer; GtkSalFrame* m_pParent; + std::list< GtkSalFrame* > m_aChildren; GdkWindowState m_nState; SystemEnvData m_aSystemData; GraphicsHolder m_aGraphics[ nMaxGraphics ]; @@ -195,6 +197,7 @@ class GtkSalFrame : public SalFrame bool m_bDefaultPos; bool m_bDefaultSize; bool m_bSendModChangeOnRelease; + String m_aTitle; IMHandler* m_pIMHandler; @@ -254,6 +257,7 @@ class GtkSalFrame : public SalFrame Size calcDefaultSize(); void setMinMaxSize(); + void createNewWindow( XLIB_Window aParent, int nScreen ); public: GtkSalFrame( SalFrame* pParent, ULONG nStyle ); GtkSalFrame( SystemParentData* pSysData ); @@ -275,6 +279,9 @@ public: GdkVisibilityState getVisibilityState() const { return m_nVisibility; } Pixmap getBackgroundPixmap() const { return m_hBackgroundPixmap; } + int getScreenNumber() const { return m_nScreen; } + + void moveToScreen( int nScreen ); virtual ~GtkSalFrame(); @@ -307,7 +314,7 @@ public: virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); virtual BOOL GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( BOOL bFullScreen ); + virtual void ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ); // Enable/Disable ScreenSaver, SystemAgents, ... virtual void StartPresentation( BOOL bStart ); // Show Window over all other Windows |