diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-11 12:06:41 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-11 12:06:41 (GMT) |
| commit | d92d1106e8cb2ca14b26b8c027d52608ee2915e9 (patch) | |
| tree | 91b75077ecf9fb4709f000b89d5963ab98cdfc9b /src/gui/kernel/qwinnativepangesturerecognizer_win_p.h | |
| parent | a295a69e76ff330a2716c97b70723f0bd408f197 (diff) | |
| parent | 24bcac9de46c89f4d8b533946e7b0feeacca1b0d (diff) | |
| download | Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.zip Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.gz Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/kernel/qwinnativepangesturerecognizer_win_p.h')
| -rw-r--r-- | src/gui/kernel/qwinnativepangesturerecognizer_win_p.h | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h b/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h index 146b067..9d0e6f7 100644 --- a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h +++ b/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h @@ -54,38 +54,8 @@ // #include <QGestureRecognizer> -#include <objbase.h> -class IInkRectangle; -class TabletHardwareCapabilities; -class TabletPropertyMetricUnit; -DECLARE_INTERFACE_(IInkTablet, IDispatch) -{ - STDMETHOD(get_Name)(THIS_ BSTR *Name) PURE; - STDMETHOD(get_PlugAndPlayId)(THIS_ BSTR *Id) PURE; - STDMETHOD(get_MaximumInputRectangle)(THIS_ IInkRectangle **Rectangle) PURE; - STDMETHOD(get_HardwareCapabilities)(THIS_ TabletHardwareCapabilities *Capabilities) PURE; - STDMETHOD(IsPacketPropertySupported)(THIS_ BSTR packetPropertyName) PURE; - STDMETHOD(GetPropertyMetrics)(THIS_ BSTR propertyName, long *Minimum, long *Maximum, TabletPropertyMetricUnit *Units, float *Resolution) PURE; -}; -enum TabletDeviceKind -{ - TDK_Mouse = 0, - TDK_Pen = 1, - TDK_Touch = 2 -}; -DECLARE_INTERFACE_(IInkTablet2, IDispatch) -{ - STDMETHOD(get_DeviceKind)(THIS_ TabletDeviceKind *Kind) PURE; -}; -DECLARE_INTERFACE_(IInkTablets, IDispatch) -{ - STDMETHOD(get_Count)(THIS_ long *Count) PURE; - STDMETHOD(get__NewEnum)(THIS_ IUnknown **_NewEnum) PURE; - STDMETHOD(get_DefaultTablet)(THIS_ IInkTablet **DefaultTablet) PURE; - STDMETHOD(Item)(THIS_ long Index, IInkTablet **Tablet) PURE; - STDMETHOD(IsPacketPropertySupported)(THIS_ BSTR packetPropertyName, VARIANT_BOOL *Supported) PURE; -}; +#ifndef QT_NO_GESTURES QT_BEGIN_NAMESPACE @@ -105,4 +75,6 @@ public: QT_END_NAMESPACE +#endif // QT_NO_GESTURES + #endif // QWINNATIVEPANGESTURERECOGNIZER_WIN_P_H |