diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-23 15:26:29 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-23 15:26:29 (GMT) |
| commit | afcffc4e0bdbac7850bcef9e67332c7cbd1ea611 (patch) | |
| tree | 0f898561b6c2106969736126ee5aa5c0a328c865 /src/gui/kernel | |
| parent | 0e917ae9587aa0727e6b26ba3eb0157362748fb7 (diff) | |
| download | Qt-afcffc4e0bdbac7850bcef9e67332c7cbd1ea611.zip Qt-afcffc4e0bdbac7850bcef9e67332c7cbd1ea611.tar.gz Qt-afcffc4e0bdbac7850bcef9e67332c7cbd1ea611.tar.bz2 | |
QT_NO_CURSOR build fix on windows. Random corrections for it on mac.
Reviewed-by: Denis Dzyubenko
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 05c6a5b..d08f8a9 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3048,6 +3048,7 @@ void QWidget::grabMouse() } } +#ifndef QT_NO_CURSOR void QWidget::grabMouse(const QCursor &) { if(isVisible() && !qt_nograb()) { @@ -3056,6 +3057,7 @@ void QWidget::grabMouse(const QCursor &) mac_mouse_grabber=this; } } +#endif void QWidget::releaseMouse() { diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 2b11bec..fa12b0d 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -851,10 +851,13 @@ void QWidget::grabMouse() Q_ASSERT(testAttribute(Qt::WA_WState_Created)); SetCapture(effectiveWinId()); mouseGrb = this; +#ifndef QT_NO_CURSOR mouseGrbCur = new QCursor(mouseGrb->cursor()); +#endif } } +#ifndef QT_NO_CURSOR void QWidget::grabMouse(const QCursor &cursor) { if (!qt_nograb()) { @@ -868,6 +871,7 @@ void QWidget::grabMouse(const QCursor &cursor) mouseGrb = this; } } +#endif void QWidget::releaseMouse() { |