diff options
| author | Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com> | 2012-05-10 14:43:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-10 22:56:25 +0200 |
| commit | 9b9895de8da08776e586f20807d4698e5d9e5680 (patch) | |
| tree | c76d3316e75c93a6c993f0fea148f496cd3b291a /src/plugins/platforms/windows/qwindowswindow.h | |
| parent | 4e8c20e97e17881e2de20640f81c3998f024287d (diff) | |
Fix for windows platform plugin to work with WINCE.
Made opengl optional.
Made Clipboard and Accessability optional.
Moved internal mime data into its on source file,
was implemented in the clipboard source
which is just strange.
Change-Id: I6ddf0c656533bd45e22e24492fc2254d15b7822f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 64fd78d1ce..b558252968 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -43,6 +43,9 @@ #define QWINDOWSWINDOW_H #include "qtwindows_additional.h" +#ifdef Q_OS_WINCE +# include "qplatformfunctions_wince.h" +#endif #include "qwindowscursor.h" #include <qpa/qplatformwindow.h> @@ -57,8 +60,10 @@ struct QWindowsGeometryHint QWindowsGeometryHint() {} explicit QWindowsGeometryHint(const QWindow *w); static QMargins frame(DWORD style, DWORD exStyle); +#ifndef Q_OS_WINCE //MinMax maybe define struct if not available void applyToMinMaxInfo(DWORD style, DWORD exStyle, MINMAXINFO *mmi) const; void applyToMinMaxInfo(HWND hwnd, MINMAXINFO *mmi) const; +#endif bool validSize(const QSize &s) const; static inline QPoint mapToGlobal(HWND hwnd, const QPoint &); @@ -76,9 +81,10 @@ struct QWindowCreationContext { QWindowCreationContext(const QWindow *w, const QRect &r, DWORD style, DWORD exStyle); - +#ifndef Q_OS_WINCE //MinMax maybe define struct if not available void applyToMinMaxInfo(MINMAXINFO *mmi) const { geometryHint.applyToMinMaxInfo(style, exStyle, mmi); } +#endif QWindowsGeometryHint geometryHint; DWORD style; @@ -176,8 +182,9 @@ public: HDC getDC(); void releaseDC(); - +#ifndef Q_OS_WINCE // maybe available on some SDKs revisit WM_GETMINMAXINFO void getSizeHints(MINMAXINFO *mmi) const; +#endif QWindowsWindowCursor cursor() const { return m_cursor; } void setCursor(const QWindowsWindowCursor &c); @@ -197,8 +204,10 @@ public: void setEnabled(bool enabled); bool isEnabled() const; +#ifndef Q_OS_WINCE void alertWindow(int durationMs = 0); void stopAlertWindow(); +#endif private: inline void show_sys() const; @@ -242,8 +251,10 @@ inline QRect operator-(const QRect &r, const QMargins &m) // Debug QDebug operator<<(QDebug d, const RECT &r); +#ifndef Q_OS_WINCE // maybe available on some SDKs revisit WM_GETMINMAXINFO/WM_NCCALCSIZE QDebug operator<<(QDebug d, const MINMAXINFO &i); QDebug operator<<(QDebug d, const NCCALCSIZE_PARAMS &p); +#endif // ---------- QWindowsGeometryHint inline functions. QPoint QWindowsGeometryHint::mapToGlobal(HWND hwnd, const QPoint &qp) |