summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-11-01 09:36:47 +0000
committerKurt Zenker <kz@openoffice.org>2005-11-01 09:36:47 +0000
commitedc0a4c468bfdc34fd1ee3f23c9870ca74d86eb6 (patch)
treef7f38ff467dd24a50d9d6956d0ba734eb01e747d
parent6a5351d47a95e1c2f1afb562c1c89faa89f1c3b8 (diff)
INTEGRATION: CWS vcl42 (1.44.114); FILE MERGED
2005/10/06 07:01:59 pl 1.44.114.2: RESYNC: (1.44-1.46); FILE MERGED 2005/07/12 13:52:54 pl 1.44.114.1: #i51331# change behaviour like in gtk plugin; no more resetting the IC, a different IC for each frame for having separate preedit states
-rw-r--r--vcl/unx/inc/salframe.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index 289e9d7998fa..0a0b5f2f9b7f 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -4,9 +4,9 @@
*
* $RCSfile: salframe.h,v $
*
- * $Revision: 1.46 $
+ * $Revision: 1.47 $
*
- * last change: $Author: hr $ $Date: 2005-09-28 14:57:38 $
+ * last change: $Author: kz $ $Date: 2005-11-01 10:36:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -153,7 +153,6 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame
SystemChildData maSystemChildData;
SalI18N_InputContext *mpInputContext;
- bool mbDeleteInputContext;
Bool mbInputFocus;
void GetPosSize( Rectangle &rPosSize );
@@ -213,6 +212,7 @@ public:
void getPosSize( Rectangle& rRect ) { GetPosSize( rRect ); }
void setPosSize( const Rectangle& rRect ) { SetPosSize( rRect ); }
bool isMapped() const { return bMapped_; }
+ bool hasFocus() const { return mbInputFocus; }
virtual SalGraphics* GetGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );