Changeset 95 for trunk/src/gui

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.

Location:

trunk/src/gui

Files:

• gui.pro (modified) (2 diffs)
• image/image.pri (modified) (1 diff)
• image/qpixmap.cpp (modified) (1 diff)
• image/qpixmap_pm.cpp (added)
• image/qpixmapdatafactory.cpp (modified) (2 diffs)
• kernel/kernel.pri (modified) (1 diff)
• kernel/qapplication.cpp (modified) (9 diffs)
• kernel/qapplication_p.h (modified) (1 diff)
• kernel/qapplication_pm.cpp (modified) (5 diffs)
• kernel/qclipboard.cpp (modified) (8 diffs)
• kernel/qclipboard_pm.cpp (added)
• kernel/qcursor_pm.cpp (added)
• kernel/qdesktopwidget_pm.cpp (added)
• kernel/qdnd_pm.cpp (added)
• kernel/qkeymapper_pm.cpp (added)
• kernel/qsound_pm.cpp (added)
• kernel/qwidget.cpp (modified) (6 diffs)
• kernel/qwidget_p.h (modified) (1 diff)
• kernel/qwidget_pm.cpp (modified) (1 diff)
• painting/painting.pri (modified) (2 diffs)
• painting/qcolormap_pm.cpp (added)
• painting/qgraphicssystem.cpp (modified) (2 diffs)
• painting/qpaintdevice_pm.cpp (added)
• painting/qregion.cpp (modified) (2 diffs)
• painting/qregion_pm.cpp (added)
• text/qfont_pm.cpp (added)
• text/qfontdatabase.cpp (modified) (2 diffs)
• text/qfontdatabase_pm.cpp (added)
• text/qfontengine_p.h (modified) (1 diff)
• text/text.pri (modified) (1 diff)
• util/qdesktopservices_pm.cpp (added)

trunk/src/gui/gui.pro

@@ -5 +5 @@
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
 
-!win32:!embedded:!mac:CONFIG      += x11
+!win32:!embedded:!mac:CONFIG      += x11
 
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
@@ -20 +20 @@
 
 #modules
-# @todo on OS/2, temporarily disable some modules until implemented
-os2 {
-    include(kernel/kernel.pri)
-} else {
-    include(kernel/kernel.pri)
-    include(image/image.pri)
-    include(painting/painting.pri)
-    include(text/text.pri)
-    include(styles/styles.pri)
-    include(widgets/widgets.pri)
-    include(dialogs/dialogs.pri)
-    include(accessible/accessible.pri)
-    include(itemviews/itemviews.pri)
-    include(inputmethod/inputmethod.pri)
-    include(graphicsview/graphicsview.pri)
-    include(util/util.pri)
-}
+include(kernel/kernel.pri)
+include(image/image.pri)
+include(painting/painting.pri)
+include(text/text.pri)
+include(styles/styles.pri)
+include(widgets/widgets.pri)
+include(dialogs/dialogs.pri)
+include(accessible/accessible.pri)
+include(itemviews/itemviews.pri)
+include(inputmethod/inputmethod.pri)
+include(graphicsview/graphicsview.pri)
+include(util/util.pri)
 
 embedded: QT += network

trunk/src/gui/image/image.pri

@@ -50 +50 @@
 win32 {
     SOURCES += image/qpixmap_win.cpp
+
+
+
 }
 embedded {

trunk/src/gui/image/qpixmap.cpp

@@ -1844 +1844 @@
 #elif defined(Q_WS_WIN)
     return 32; // XXX
+
+
 #elif defined(Q_WS_MAC)
     return 32;

trunk/src/gui/image/qpixmapdatafactory.cpp

@@ -51 +51 @@
 # include <private/qpixmap_raster_p.h>
 #endif
+
+
+
 #ifdef Q_WS_MAC
 # include <private/qpixmap_mac_p.h>
@@ -78 +81 @@
 #elif defined(Q_WS_WIN)
     return new QRasterPixmapData(type);
+
+
 #elif defined(Q_WS_MAC)
     return new QMacPixmapData(type);

trunk/src/gui/kernel/kernel.pri

@@ -92 +92 @@
 
 os2 {
-        # @todo override everything since most things are not ready...
-        HEADERS = \
-                kernel/qapplication.h \
-                kernel/qapplication_p.h \
-                kernel/qwidget.h \
-                kernel/qwidget_p.h
-        SOURCES = \
-                kernel/qapplication.cpp \
-                kernel/qwidget.cpp
-
         SOURCES += \
                 kernel/qapplication_pm.cpp \
+
+
+
+
+
+
                 kernel/qwidget_pm.cpp
 }

trunk/src/gui/kernel/qapplication.cpp

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

trunk/src/gui/kernel/qapplication_p.h

@@ -317 +317 @@
     }
 #endif
+
     static QInputContext *inputContext;
-
+#endif
     static Qt::MouseButtons mouse_buttons;
     static Qt::KeyboardModifiers modifier_buttons;

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -82 +82 @@
 static bool     qt_try_modal(QWidget *, QMSG *, int& ret);
 
-static QWidget *qt_button_down = 0; // widget got last button-down
+QWidget *qt_button_down = 0; // widget got last button-down
+QPointer<QWidget> qt_last_mouse_receiver = 0;
 
 static HWND autoCaptureWnd = NULLHANDLE;
@@ -273 +274 @@
  *****************************************************************************/
 
+
+
+
+
+
 /*****************************************************************************
   Platform specific QApplication members
@@ -286 +292 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*****************************************************************************
   QApplication cursor stack
  *****************************************************************************/
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*****************************************************************************
   Routines to find a Qt widget from a screen position
  *****************************************************************************/
 
+
+
+
+
+
+
 /*****************************************************************************
   Main event loop
  *****************************************************************************/
+
+
+
+
+
+
+
+
+
 
 /*****************************************************************************
@@ -315 +419 @@
  *****************************************************************************/
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*****************************************************************************
   Popup widget mechanism
@@ -329 +449 @@
  *****************************************************************************/
 
+
+
+
+
+
+
+
+
+
+
 /*****************************************************************************
   Event translation; translates PM events to Qt events

trunk/src/gui/kernel/qclipboard.cpp

@@ -160 +160 @@
 #endif
 
-#ifndef Q_WS_WIN32
+#if
 /*!
     \internal
@@ -230 +230 @@
 
     \value Selection  indicates that data should be stored and retrieved from
-    the global mouse selection. Support for \c Selection is provided only on 
+    the global mouse selection. Support for \c Selection is provided only on
     systems with a global mouse selection (e.g. X11).
 
@@ -346 +346 @@
     image is retrieved from the global clipboard.  If \a mode is
     QClipboard::Selection, the image is retrieved from the global
-    mouse selection. 
+    mouse selection.
 
     \sa setImage() pixmap() mimeData(), QImage::isNull()
@@ -461 +461 @@
 */
 
-/*! 
+/*!
     \fn void QClipboard::clear(Mode mode)
     Clear the clipboard contents.
@@ -469 +469 @@
     function clears the the global clipboard contents.  If \a mode is
     QClipboard::Selection, this function clears the global mouse
-    selection contents. If \a mode is QClipboard::FindBuffer, this 
+    selection contents. If \a mode is QClipboard::FindBuffer, this
     function clears the search string buffer.
 
@@ -562 +562 @@
 }
 
-/*! 
+/*!
     \internal
     \fn bool QClipboard::supportsMode(Mode mode) const;
@@ -569 +569 @@
 */
 
-/*! 
+/*!
     \internal
     \fn bool QClipboard::ownsMode(Mode mode) const;
@@ -576 +576 @@
 */
 
-/*! 
+/*!
     \internal
     Emits the appropriate changed signal for \a mode.

trunk/src/gui/kernel/qwidget.cpp

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

trunk/src/gui/kernel/qwidget_p.h

@@ -594 +594 @@
 #endif
 
-#if defined(Q_WS_X11) || defined (Q_WS_WIN)  || defined (Q_WS_PM) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined (Q_WS_WIN) || defined (Q_WS_PM) || defined(Q_WS_MAC)
 #ifdef Q_WS_MAC
     void setWSGeometry(bool dontShow=false, const QRect &oldRect = QRect());

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -64 +64 @@
  *****************************************************************************/
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE

trunk/src/gui/painting/painting.pri

@@ -112 +112 @@
 }
 
+
+
+
+
+
+
+
 embedded {
     HEADERS += \
@@ -170 +177 @@
 }
 
-win32|x11|mac|embedded {
+win32|x11|mac|embedded {
         SOURCES += painting/qbackingstore.cpp
         HEADERS += painting/qbackingstore_p.h

trunk/src/gui/painting/qgraphicssystem.cpp

@@ -48 +48 @@
 # include <private/qpixmap_raster_p.h>
 #endif
+
+
+
 #ifdef Q_WS_MAC
 # include <private/qpixmap_mac_p.h>
@@ -67 +70 @@
 #elif defined(Q_WS_WIN)
     return new QRasterPixmapData(type);
+
+
 #elif defined(Q_WS_MAC)
     return new QMacPixmapData(type);

trunk/src/gui/painting/qregion.cpp

@@ -566 +566 @@
   \sa intersected()
 */
-#if !defined(Q_WS_WIN) || defined(Q_OS_WINCE)
+#if )
 QRegion& QRegion::operator&=(const QRegion &r)
     { return *this = *this & r; }
@@ -596 +596 @@
   \sa subtracted()
 */
-#if !defined(Q_WS_WIN) || defined(Q_OS_WINCE)
+#if )
 QRegion& QRegion::operator-=(const QRegion &r)
     { return *this = *this - r; }

trunk/src/gui/text/qfontdatabase.cpp

@@ -876 +876 @@
 #elif defined(Q_WS_WIN)
 #  include "qfontdatabase_win.cpp"
+
+
 #elif defined(Q_WS_QWS)
 #  include "qfontdatabase_qws.cpp"
@@ -2419 +2421 @@
 */
 
-/*! 
+/*!
     \fn bool QFontDatabase::supportsThreadedFontRendering()
     \since 4.4

trunk/src/gui/text/qfontengine_p.h

@@ -323 +323 @@
     virtual void recalcAdvances(QGlyphLayout *, QTextEngine::ShaperFlags) const;
 
-#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
+#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
     void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si);
 #endif

trunk/src/gui/text/text.pri

@@ -74 +74 @@
                 text/qfontengine_win.cpp
         HEADERS += text/qfontengine_win_p.h
+
+
+
+
+
 }