Changeset 95 for trunk/src/gui/kernel/qapplication.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/qapplication.cpp (modified) (9 diffs)

trunk/src/gui/kernel/qapplication.cpp

@@ -127 +127 @@
 QApplicationPrivate *QApplicationPrivate::self = 0;
 
+#ifndef QT_NO_IM
 QInputContext *QApplicationPrivate::inputContext;
+#endif
 
 bool QApplicationPrivate::quitOnLastWindowClosed = true;
@@ -2056 +2058 @@
         focus_widget = focus;
 
+#ifndef QT_NO_IM
         if (prev && ((reason != Qt::PopupFocusReason && reason != Qt::MenuBarFocusReason
             && prev->testAttribute(Qt::WA_InputMethodEnabled))
@@ -2068 +2071 @@
             }
         }
+#endif
 
         if(focus_widget)
@@ -2089 +2093 @@
             }
             if(focus && QApplicationPrivate::focus_widget == focus) {
+#ifndef QT_NO_IM
                 if (focus->testAttribute(Qt::WA_InputMethodEnabled)) {
                     QInputContext *qic = focus->inputContext();
@@ -2094 +2099 @@
                         qic->setFocusWidget( focus_widget );
                 }
+#endif
                 QFocusEvent in(QEvent::FocusIn, reason);
                 QPointer<QWidget> that = focus;
@@ -4903 +4909 @@
 void QApplication::setInputContext(QInputContext *inputContext)
 {
+#ifndef QT_NO_IM
     Q_D(QApplication);
     Q_UNUSED(d);// only static members being used.
@@ -4912 +4919 @@
         delete d->inputContext;
     d->inputContext = inputContext;
+#endif
 }
 
@@ -4921 +4929 @@
 QInputContext *QApplication::inputContext() const
 {
+#ifndef QT_NO_IM
     Q_D(const QApplication);
     Q_UNUSED(d);// only static members being used.
@@ -4936 +4945 @@
 #endif
     return d->inputContext;
+#else
+    return 0;
+#endif
 }