Changeset 1012 for trunk/src/gui/kernel/qwidget.cpp

Timestamp:

Aug 20, 2011, 1:59:50 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Create native widget siblings and children when native ID is requested.

This makes sure each sibling and child of the widget for which a native
window is created will get a native window too. This is necessary to let
the system do proper clipping when the widget is painted on externally
using its native window ID.

Note that on OS/2 system clipping is not done (see QWidget::create_sys())
so qt_WinProcessWindowObstacles() needs to be used to clip out areas
obscured by other widgets when directly painting on the widget bypassing
Qt.

File:

• trunk/src/gui/kernel/qwidget.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qwidget.cpp

@@ -798 +798 @@
     one of the more specialized handlers above.
 
-    Events and the mechanism used to deliver them are covered in 
+    Events and the mechanism used to deliver them are covered in
     \l{The Event System}.
 
@@ -10063 +10063 @@
     bool newParent = (parent != parentWidget()) || !wasCreated || desktopWidget;
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN)
     if (newParent && parent && !desktopWidget) {
         if (testAttribute(Qt::WA_NativeWindow) && !qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings))
@@ -10723 +10723 @@
             }
         }
+#endif //QT_NO_IM
         if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
             parentWidget()->d_func()->enforceNativeChildren();
         if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
             d->createWinId();
+#ifndef QT_NO_IM
         if (ic && isEnabled() && focusWidget->isEnabled()
             && focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) {
@@ -10736 +10738 @@
     case Qt::WA_PaintOnScreen:
         d->updateIsOpaque();
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN)
         // Recreate the widget if it's already created as an alien widget and
         // WA_PaintOnScreen is enabled. Paint on screen widgets must have win id.