equal
deleted
inserted
replaced
714 if(!o->isWidgetType()) |
714 if(!o->isWidgetType()) |
715 continue; |
715 continue; |
716 if (QWidget *w = static_cast<QWidget *>(o)) |
716 if (QWidget *w = static_cast<QWidget *>(o)) |
717 qt_set_windows_updateScrollBar(w); |
717 qt_set_windows_updateScrollBar(w); |
718 } |
718 } |
|
719 #ifndef QT_NO_SCROLLBAR |
719 if (qobject_cast<QScrollBar*>(widget)) |
720 if (qobject_cast<QScrollBar*>(widget)) |
720 widget->updateGeometry(); |
721 widget->updateGeometry(); |
|
722 #endif |
721 } |
723 } |
722 |
724 |
723 |
725 |
724 /***************************************************************************** |
726 /***************************************************************************** |
725 qt_init() - initializes Qt for Windows |
727 qt_init() - initializes Qt for Windows |
1497 ::SendMessage(imeParentWnd, WM_IME_ENDCOMPOSITION, 0, 0); |
1499 ::SendMessage(imeParentWnd, WM_IME_ENDCOMPOSITION, 0, 0); |
1498 } |
1500 } |
1499 |
1501 |
1500 switch (message) { |
1502 switch (message) { |
1501 #ifndef Q_WS_WINCE |
1503 #ifndef Q_WS_WINCE |
|
1504 #ifndef QT_NO_SESSIONMANAGER |
1502 case WM_QUERYENDSESSION: { |
1505 case WM_QUERYENDSESSION: { |
1503 if (sm_smActive) // bogus message from windows |
1506 if (sm_smActive) // bogus message from windows |
1504 RETURN(true); |
1507 RETURN(true); |
1505 |
1508 |
1506 sm_smActive = true; |
1509 sm_smActive = true; |
1529 QApplication::quit(); |
1532 QApplication::quit(); |
1530 } |
1533 } |
1531 |
1534 |
1532 RETURN(0); |
1535 RETURN(0); |
1533 } |
1536 } |
|
1537 #endif |
1534 case WM_DISPLAYCHANGE: |
1538 case WM_DISPLAYCHANGE: |
1535 if (QApplication::type() == QApplication::Tty) |
1539 if (QApplication::type() == QApplication::Tty) |
1536 break; |
1540 break; |
1537 if (qt_desktopWidget) { |
1541 if (qt_desktopWidget) { |
1538 qt_desktopWidget->move(GetSystemMetrics(76), GetSystemMetrics(77)); |
1542 qt_desktopWidget->move(GetSystemMetrics(76), GetSystemMetrics(77)); |
2234 mmi->ptMaxTrackSize.y = maxh + fs.top() + fs.bottom(); |
2238 mmi->ptMaxTrackSize.y = maxh + fs.top() + fs.bottom(); |
2235 RETURN(0); |
2239 RETURN(0); |
2236 } |
2240 } |
2237 break; |
2241 break; |
2238 |
2242 |
|
2243 #ifndef QT_NO_CONTEXTMENU |
2239 case WM_CONTEXTMENU: |
2244 case WM_CONTEXTMENU: |
2240 { |
2245 { |
2241 // it's not VK_APPS or Shift+F10, but a click in the NC area |
2246 // it's not VK_APPS or Shift+F10, but a click in the NC area |
2242 if (lParam != (int)0xffffffff) { |
2247 if (lParam != (int)0xffffffff) { |
2243 result = false; |
2248 result = false; |
2261 qt_win_getKeyboardModifiers()); |
2266 qt_win_getKeyboardModifiers()); |
2262 result = qt_sendSpontaneousEvent(fw, &e); |
2267 result = qt_sendSpontaneousEvent(fw, &e); |
2263 } |
2268 } |
2264 } |
2269 } |
2265 break; |
2270 break; |
|
2271 #endif |
2266 #endif |
2272 #endif |
2267 |
2273 |
2268 case WM_IME_STARTCOMPOSITION: |
2274 case WM_IME_STARTCOMPOSITION: |
2269 case WM_IME_ENDCOMPOSITION: |
2275 case WM_IME_ENDCOMPOSITION: |
2270 case WM_IME_COMPOSITION: { |
2276 case WM_IME_COMPOSITION: { |