Changeset 561 for trunk/src/gui/kernel/qclipboard_win.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qclipboard_win.cpp (modified) (7 diffs)

trunk/src/gui/kernel/qclipboard_win.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -52 +52 @@
 #include "qt_windows.h"
 #include "qdnd_p.h"
+#include <private/qwidget_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -141 +142 @@
         clipBoardViewer->createWinId();
         clipBoardViewer->setObjectName(QLatin1String("internal clipboard owner"));
+        // We dont need this internal widget to appear in QApplication::topLevelWidgets()
+        if (QWidgetPrivate::allWidgets)
+            QWidgetPrivate::allWidgets->remove(clipBoardViewer);
     }
 
@@ -201 +205 @@
         clipData = GetClipboardData(CF_UNICODETEXT);
         if (clipData != 0)
-            clipText = QString::fromUtf16((unsigned short *)clipData);
+            clipText = QString::fromWCharArray((wchar_t *)clipData);
     } else {
         clipText = QString::fromLatin1((const char*)clipData);
@@ -329 +333 @@
 
     if (propagate && d->nextClipboardViewer) {
-        QT_WA({
-            SendMessage(d->nextClipboardViewer, m->message,
-                         m->wParam, m->lParam);
-        } , {
-            SendMessageA(d->nextClipboardViewer, m->message,
-                         m->wParam, m->lParam);
-        });
+        SendMessage(d->nextClipboardViewer, m->message, m->wParam, m->lParam);
     }