equal
deleted
inserted
replaced
1436 |
1436 |
1437 extern Q_GUI_EXPORT bool qt_win_ignoreNextMouseReleaseEvent; |
1437 extern Q_GUI_EXPORT bool qt_win_ignoreNextMouseReleaseEvent; |
1438 |
1438 |
1439 HRESULT WINAPI QAxClientSite::EnableModeless(BOOL fEnable) |
1439 HRESULT WINAPI QAxClientSite::EnableModeless(BOOL fEnable) |
1440 { |
1440 { |
1441 #if !defined(Q_OS_WINCE) |
|
1442 LockWindowUpdate(host->window()->winId()); |
|
1443 #endif |
|
1444 EnableWindow(host->window()->winId(), fEnable); |
1441 EnableWindow(host->window()->winId(), fEnable); |
1445 |
1442 |
1446 if (!fEnable) { |
1443 if (!fEnable) { |
1447 if (!QApplicationPrivate::isBlockedByModal(host)) |
1444 if (!QApplicationPrivate::isBlockedByModal(host)) |
1448 QApplicationPrivate::enterModal(host); |
1445 QApplicationPrivate::enterModal(host); |
1449 } else { |
1446 } else { |
1450 if (QApplicationPrivate::isBlockedByModal(host)) |
1447 if (QApplicationPrivate::isBlockedByModal(host)) |
1451 QApplicationPrivate::leaveModal(host); |
1448 QApplicationPrivate::leaveModal(host); |
1452 } |
1449 } |
1453 qt_win_ignoreNextMouseReleaseEvent = false; |
1450 qt_win_ignoreNextMouseReleaseEvent = false; |
1454 #if !defined(Q_OS_WINCE) |
|
1455 LockWindowUpdate(0); |
|
1456 #endif |
|
1457 return S_OK; |
1451 return S_OK; |
1458 } |
1452 } |
1459 |
1453 |
1460 HRESULT WINAPI QAxClientSite::TranslateAccelerator(LPMSG lpMsg, WORD grfModifiers) |
1454 HRESULT WINAPI QAxClientSite::TranslateAccelerator(LPMSG lpMsg, WORD grfModifiers) |
1461 { |
1455 { |