summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-11-01 09:35:58 +0000
committerKurt Zenker <kz@openoffice.org>2005-11-01 09:35:58 +0000
commit6d60a1f692af3167bbbc8e1a800aac4d07f16c43 (patch)
tree54cf0123ae79c2967acfbb10e38104ecf046d64f /vcl
parent56272d720ef93b9d36f8bc85ba2c28ca5049b643 (diff)
INTEGRATION: CWS vcl42 (1.7.490); FILE MERGED
2005/10/06 06:58:44 pl 1.7.490.2: RESYNC: (1.7-1.8); FILE MERGED 2005/07/12 13:52:52 pl 1.7.490.1: #i51331# change behaviour like in gtk plugin; no more resetting the IC, a different IC for each frame for having separate preedit states
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/inc/i18n_cb.hxx19
1 files changed, 13 insertions, 6 deletions
diff --git a/vcl/unx/inc/i18n_cb.hxx b/vcl/unx/inc/i18n_cb.hxx
index 209d586f8431..8aa44b442f2f 100644
--- a/vcl/unx/inc/i18n_cb.hxx
+++ b/vcl/unx/inc/i18n_cb.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: i18n_cb.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 12:39:30 $
+ * last change: $Author: kz $ $Date: 2005-11-01 10:35:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -35,6 +35,11 @@
#ifndef _SAL_I18N_CALLBACK_HXX
#define _SAL_I18N_CALLBACK_HXX
+#ifndef _SV_SALWTYPE_HXX
+#include <salwtype.hxx>
+#endif
+#include <vector>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -89,10 +94,12 @@ typedef enum {
} preedit_status_t;
typedef struct {
- SalFrame* pFrame;
- Bool bIsMultilingual;
- preedit_status_t eState;
- preedit_text_t aText;
+ SalFrame* pFrame;
+ Bool bIsMultilingual;
+ preedit_status_t eState;
+ preedit_text_t aText;
+ SalExtTextInputEvent aInputEv;
+ std::vector< USHORT > aInputFlags;
} preedit_data_t;
#endif /* _SAL_I18N_CALLBACK_HXX */