Changeset 786 for trunk/src/gui/kernel
- Timestamp:
- Oct 7, 2010, 3:04:40 PM (15 years ago)
- Location:
- trunk/src/gui/kernel
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gui/kernel/qapplication_pm.cpp
r785 r786 1084 1084 bool focus = SHORT1FROMMP(mp2); 1085 1085 if (!focus) { 1086 if (!QWidget::find(hwnd) && !QDragManager::self()-> object) {1086 if (!QWidget::find(hwnd) && !QDragManager::self()->) { 1087 1087 // we gave up focus to another application, unset Qt 1088 // focus (exclude the situation when we start drag in1089 // which case the PM focus goes to the drag bitmap while1090 // the Qt focus should stay with our application)1088 // focus (exclude the situation when we 1089 // 1090 // ) 1091 1091 if (QApplication::activePopupWidget()) { 1092 1092 foreignFocusWnd = hwnd; -
trunk/src/gui/kernel/qdnd_p.h
r651 r786 267 267 QWidget *currentTarget(); 268 268 269 270 269 271 #ifdef Q_WS_X11 270 272 QPixmap xdndMimeTransferedPixmap[2]; … … 287 289 #endif 288 290 #ifdef Q_OS_SYMBIAN 289 #ifndef QT_NO_CURSOR 291 #ifndef QT_NO_CURSOR 290 292 QCursor overrideCursor; 291 293 #endif -
trunk/src/gui/kernel/qwidget.cpp
r769 r786 11057 11057 return (HPS) d->hd; 11058 11058 #ifndef QT_NO_DRAGANDDROP 11059 if (QDragManager::self()->isInDrag()) 11059 if (QDragManager::self()->isInDrag() || 11060 QDragManager::self()->isInOwnDrag()) 11060 11061 return DrgGetPS(winId()); 11061 11062 #endif … … 11076 11077 if (d->hd == NULLHANDLE) { 11077 11078 #ifndef QT_NO_DRAGANDDROP 11078 if (QDragManager::self()->isInDrag()) 11079 if (QDragManager::self()->isInDrag() || 11080 QDragManager::self()->isInOwnDrag()) 11079 11081 DrgReleasePS(hps); 11080 11082 else
Note:
See TracChangeset
for help on using the changeset viewer.