diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 12:56:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 12:56:30 +0000 |
| commit | 4542dfa9bbd9895f3d1a1ee1f810fa1bce310980 (patch) | |
| tree | 70a91734fde4189e2174dfa978caa0f38a3a837c /vcl/unx | |
| parent | 6efe250f4306aabc5ba91dfca6e5734164f99d78 (diff) | |
INTEGRATION: CWS c12v002_SRC680 (1.51.14); FILE MERGED
2007/03/29 15:48:49 rt 1.51.14.2: RESYNC: (1.51-1.52); FILE MERGED
2007/03/12 13:53:15 pl 1.51.14.1: #b6453597# xembed for bean
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/inc/salframe.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h index 3b75bdccf103..76ba060cb630 100644 --- a/vcl/unx/inc/salframe.h +++ b/vcl/unx/inc/salframe.h @@ -4,9 +4,9 @@ * * $RCSfile: salframe.h,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: rt $ $Date: 2007-07-24 10:29:33 $ + * last change: $Author: vg $ $Date: 2007-08-30 13:56:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -131,6 +131,7 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame BOOL bMapped_; BOOL mbInShow; BOOL bDefaultPosition_; // client is centered initially + bool m_bXEmbed; int nVisibility_; int m_nWorkArea; @@ -190,6 +191,9 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame void passOnSaveYourSelf(); void createNewWindow( XLIB_Window aParent, int nScreen = -1 ); + + void setXEmbedInfo(); + void askForXEmbedFocus( sal_Int32 i_nTimeCode ); public: X11SalFrame( SalFrame* pParent, ULONG nSalFrameStyle, SystemParentData* pSystemParent = NULL ); virtual ~X11SalFrame(); |