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

Timestamp:

Jul 31, 2009, 1:13:57 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added OS/2 stubs for platform-specific parts of all key GUI classes. Non-key classes are temporarily disabled with QT_NO_ defines.

File:

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

trunk/src/gui/kernel/qwidget.cpp

@@ -298 +298 @@
 void QWidget::setInputContext(QInputContext *context)
 {
+#ifndef QT_NO_IM
     Q_D(QWidget);
     if (!testAttribute(Qt::WA_InputMethodEnabled))
         return;
-#ifndef QT_NO_IM
     if (d->ic)
         delete d->ic;
@@ -323 +323 @@
 void QWidget::resetInputContext()
 {
+#ifndef QT_NO_IM
     if (!hasFocus())
         return;
-#ifndef QT_NO_IM
     QInputContext *qic = this->inputContext();
     if(qic)
@@ -9822 +9822 @@
 #endif
     case Qt::WA_NativeWindow: {
+#ifndef QT_NO_IM
         QInputContext *ic = 0;
         if (on && !internalWinId() && testAttribute(Qt::WA_InputMethodEnabled) && hasFocus()) {
@@ -9828 +9829 @@
             ic->setFocusWidget(0);
         }
+#endif
         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)
             ic->setFocusWidget(this);
+#endif
         break;
     }
@@ -9867 +9871 @@
             QInputContextPrivate::updateImeStatus(this, true);
 #endif
+#ifndef QT_NO_IM
         QInputContext *ic = d->ic;
         if (!ic) {
@@ -9881 +9886 @@
             }
         }
+#endif
         break;
     }