summaryrefslogtreecommitdiff
path: root/vcl/unx/inc/plugins
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-08-30 12:57:00 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-08-30 12:57:00 +0000
commit7a32c8be1db72dd95d342e2327055fa93cf07e73 (patch)
tree081a1998ce229a0153b2fda72f1ea12a3a2c735d /vcl/unx/inc/plugins
parent4b09ddf529c6b1b918e45cebcf63b0158b4e5b01 (diff)
INTEGRATION: CWS c12v002_SRC680 (1.24.14); FILE MERGED
2007/03/29 15:49:44 rt 1.24.14.2: RESYNC: (1.24-1.25); FILE MERGED 2007/03/12 13:53:16 pl 1.24.14.1: #b6453597# xembed for bean
Diffstat (limited to 'vcl/unx/inc/plugins')
-rw-r--r--vcl/unx/inc/plugins/gtk/gtkframe.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
index e5793a443e5b..79e645d781de 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.29 $
+ * $Revision: 1.30 $
*
- * last change: $Author: hr $ $Date: 2007-08-02 15:00:46 $
+ * last change: $Author: vg $ $Date: 2007-08-30 13:57:00 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -199,6 +199,7 @@ class GtkSalFrame : public SalFrame
bool m_bDefaultPos;
bool m_bDefaultSize;
bool m_bSendModChangeOnRelease;
+ bool m_bWindowIsGtkPlug;
String m_aTitle;
IMHandler* m_pIMHandler;
@@ -261,7 +262,8 @@ class GtkSalFrame : public SalFrame
Size calcDefaultSize();
void setMinMaxSize();
- void createNewWindow( XLIB_Window aParent, int nScreen );
+ void createNewWindow( XLIB_Window aParent, bool bXEmbed, int nScreen );
+ void askForXEmbedFocus( sal_Int32 nTimecode );
public:
GtkSalFrame( SalFrame* pParent, ULONG nStyle );
GtkSalFrame( SystemParentData* pSysData );