summaryrefslogtreecommitdiff
path: root/library/inputmethodinterface.h
authorzecke <zecke>2002-09-10 12:09:49 (UTC)
committer zecke <zecke>2002-09-10 12:09:49 (UTC)
commit6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff)
tree6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/inputmethodinterface.h
parentd10cddb3c9ce75bc90b14add14bc133737fe35aa (diff)
downloadopie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip
opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz
opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2
Qtopia1-6 merge
still to test bic changes to be resolved more changes to be made?
Diffstat (limited to 'library/inputmethodinterface.h') (more/less context) (ignore whitespace changes)
-rw-r--r--library/inputmethodinterface.h19
1 files changed, 17 insertions, 2 deletions
diff --git a/library/inputmethodinterface.h b/library/inputmethodinterface.h
index ae14218..88a121d 100644
--- a/library/inputmethodinterface.h
+++ b/library/inputmethodinterface.h
@@ -1,16 +1,16 @@
/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
@@ -27,23 +27,38 @@
#include <qstring.h>
#ifndef QT_NO_COMPONENT
// {637A8A14-AF98-41DA-969A-2BD16ECDA8C7}
# ifndef IID_InputMethod
# define IID_InputMethod QUuid( 0x637a8a14, 0xaf98, 0x41da, 0x96, 0x9a, 0x2b, 0xd1, 0x6e, 0xcd, 0xa8, 0xc7)
# endif
#endif
class QWidget;
class QPixmap;
class QObject;
+class QWSInputMethod;
struct InputMethodInterface : public QUnknownInterface
{
virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ) = 0;
virtual void resetState() = 0;
virtual QPixmap *icon() = 0;
virtual QString name() = 0;
virtual void onKeyPress( QObject *receiver, const char *slot ) = 0;
};
+// {70F0991C-8282-4625-A279-BD9D7D959FF6}
+#ifndef IID_ExtInputMethod
+#define IID_ExtInputMethod QUuid( 0x70f0991c, 0x8282, 0x4625, 0xa2, 0x79, 0xbd, 0x9d, 0x7d, 0x95, 0x9f, 0xf6)
+#endif
+
+struct ExtInputMethodInterface : public QUnknownInterface
+{
+ virtual QWSInputMethod *inputMethod() = 0;
+ virtual QPixmap *icon() = 0;
+ virtual QString name() = 0;
+ virtual QWidget *widget( QWidget *parent, Qt::WFlags f )= 0;
+};
+
+
#endif