Changeset 561 for trunk/src/gui/dialogs/qwizard_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/dialogs/qwizard_win.cpp (modified) (9 diffs)

trunk/src/gui/dialogs/qwizard_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$
 **
@@ -240 +240 @@
     : pressed(false)
     , wizard(wizard)
+    , backButton_(0)
 {
     is_vista = resolveSymbols();
-    backButton_ = new QVistaBackButton(wizard);
+    if (is_vista)
+        backButton_ = new QVistaBackButton(wizard);
 }
 
@@ -278 +280 @@
 {
     DWORD rgb;
-    HANDLE hTheme = pOpenThemeData(qApp->desktop()->winId(), L"WINDOW");
+    HANDLE hTheme = pOpenThemeData(QApplication::desktop()->winId(), L"WINDOW");
     pGetThemeColor(
         hTheme, WIZ_WP_CAPTION, WIZ_CS_ACTIVE,
@@ -311 +313 @@
             painter->paintEngine()->getDC());
 
+    Q_ASSERT(backButton_);
     const int btnTop = backButton_->mapToParent(QPoint()).y();
     const int btnHeight = backButton_->size().height();
@@ -385 +388 @@
 void QVistaHelper::setMouseCursor(QPoint pos)
 {
+#ifndef QT_NO_CURSOR
     if (rtTop.contains(pos))
         wizard->setCursor(Qt::SizeVerCursor);
     else
         wizard->setCursor(Qt::ArrowCursor);
+#endif
 }
 
@@ -609 +614 @@
     bool value = false;
     if (vistaState() == VistaAero) {
-        HANDLE hTheme = pOpenThemeData(qApp->desktop()->winId(), L"WINDOW");
+        HANDLE hTheme = pOpenThemeData(QApplication::desktop()->winId(), L"WINDOW");
         if (!hTheme) return false;
         // Set up a memory DC and bitmap that we'll draw into
         HDC dcMem;
         HBITMAP bmp;
-        BITMAPINFO dib = {0};
+        BITMAPINFO dib = {{0}};
         dcMem = CreateCompatibleDC(hdc);
 
@@ -660 +665 @@
         HDC dcMem;
         HBITMAP bmp;
-        BITMAPINFO dib = {0};
+        BITMAPINFO dib = {{0}};
         dcMem = CreateCompatibleDC(hdc);