summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-04-03 14:50:42 +0000
committerKurt Zenker <kz@openoffice.org>2008-04-03 14:50:42 +0000
commiteb03395d268229155da305d39d87436ffa9382d4 (patch)
treed8eeff001613610875559e051276b6a60101fae3 /vcl
parentaab79df7c58aafdf3d8f86ccede3bfba656e547e (diff)
INTEGRATION: CWS presenterview (1.52.106); FILE MERGED
2008/03/26 10:50:12 cl 1.52.106.5: RESYNC: (1.55-1.56); FILE MERGED 2007/10/12 13:25:58 pl 1.52.106.4: #i82554# add WB_SYSTEMCHILDWINDOW 2007/09/11 16:27:41 af 1.52.106.3: RESYNC: (1.53-1.55); FILE MERGED 2007/07/11 10:24:28 af 1.52.106.2: RESYNC: (1.52-1.53); FILE MERGED 2007/03/02 10:21:34 pl 1.52.106.1: #i74774# new Get/SetScreenNumber functionality for SystemWindows
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/inc/salframe.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index bb5e83f41caf..69d22ffe9f5b 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -4,9 +4,9 @@
*
* $RCSfile: salframe.h,v $
*
- * $Revision: 1.56 $
+ * $Revision: 1.57 $
*
- * last change: $Author: kz $ $Date: 2008-03-05 17:12:34 $
+ * last change: $Author: kz $ $Date: 2008-04-03 15:50:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -191,6 +191,7 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame
void passOnSaveYourSelf();
void createNewWindow( XLIB_Window aParent, int nScreen = -1 );
+ void updateScreenNumber();
void setXEmbedInfo();
void askForXEmbedFocus( sal_Int32 i_nTimeCode );
@@ -222,6 +223,8 @@ public:
void *pExtTextEvent);
#endif
bool IsOverrideRedirect() const;
+ bool IsChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_PLUG|SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
+ bool IsSysChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
bool IsFloatGrabWindow() const;
SalI18N_InputContext* getInputContext() const { return mpInputContext; }
void getPosSize( Rectangle& rRect ) { GetPosSize( rRect ); }
@@ -277,6 +280,8 @@ public:
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetBackgroundBitmap( SalBitmap* pBitmap );
+ virtual void SetScreenNumber( unsigned int );
+
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
virtual void ResetClipRegion();