Changeset 846 for trunk/src/gui/kernel/qwidget_win.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qwidget_win.cpp (modified) (19 diffs)

trunk/src/gui/kernel/qwidget_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -48 +48 @@
 #include "qimage.h"
 #include "qlayout.h"
-#include "qlibrary.h"
 #include "qpainter.h"
 #include "qstack.h"
@@ -66 +65 @@
 #include <private/qwininputcontext_p.h>
 #include <private/qpaintengine_raster_p.h>
+
 
 #if defined(Q_WS_WINCE)
@@ -71 +71 @@
 QT_USE_NAMESPACE
 extern void qt_wince_maximize(QWidget *widget);                          //defined in qguifunctions_wince.cpp
+
 extern void qt_wince_minimize(HWND hwnd);                                //defined in qguifunctions_wince.cpp
 extern void qt_wince_full_screen(HWND hwnd, bool fullScreen, UINT swpf); //defined in qguifunctions_wince.cpp
@@ -124 +125 @@
 static PtrWTQueueSizeGet ptrWTQueueSizeGet = 0;
 static PtrWTQueueSizeSet ptrWTQueueSizeSet = 0;
+
 static void init_wintab_functions();
 static void qt_tablet_init();
 static void qt_tablet_cleanup();
+
 extern HCTX qt_tablet_context;
 extern bool qt_tablet_tilt_support;
@@ -137 +140 @@
 
 extern bool qt_is_gui_used;
+
+
 static void init_wintab_functions()
 {
@@ -144 +149 @@
     if (!qt_is_gui_used)
         return;
-    QLibrary library(QLatin1String("wintab32"));
+    QLibrary library(QLatin1String("wintab32"));
     ptrWTOpen = (PtrWTOpen)library.resolve("WTOpenW");
     ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
@@ -162 +167 @@
     qt_tablet_widget->createWinId();
     qt_tablet_widget->setObjectName(QLatin1String("Qt internal tablet widget"));
-    // We dont need this internal widget to appear in QApplication::topLevelWidgets()
+    // We dont need this internal widget to appear in QApplication::topLevelWidgets()
     if (QWidgetPrivate::allWidgets)
         QWidgetPrivate::allWidgets->remove(qt_tablet_widget);
@@ -228 +233 @@
     qt_tablet_widget = 0;
 }
+
 
 const QString qt_reg_winclass(QWidget *w);                // defined in qapplication_win.cpp
@@ -244 +250 @@
 static HHOOK   journalRec  = 0;
 
-extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
+extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
 
 #define XCOORD_MAX 16383
@@ -513 +519 @@
     }
 
+
     if (q != qt_tablet_widget && QWidgetPrivate::mapper)
         qt_tablet_init();
+
 
     if (q->testAttribute(Qt::WA_DropSiteRegistered))
@@ -538 +546 @@
 {
     Q_D(QWidget);
+
     if (!isWindow() && parentWidget())
         parentWidget()->d_func()->invalidateBuffer(d->effectiveRectFor(geometry()));
@@ -826 +835 @@
 // The procedure does nothing, but is required for mousegrabbing to work
 #ifndef Q_WS_WINCE
-LRESULT CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
     return CallNextHookEx(journalRec, nCode, wParam, lParam);
@@ -1093 +1102 @@
         invalidateBuffer(q->rect());
         return;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -1142 +1166 @@
         if (IsZoomed(q->internalWinId()))
             data.window_state |= Qt::WindowMaximized;
+
+
+
+
+
     }
 
@@ -1519 +1548 @@
     if (data.window_flags & Qt::MSWindowsFixedSizeDialogHint)
         return false;
-    // if the user explicitely asked for the maximize button, we try to add
+    // if the user explicitly asked for the maximize button, we try to add
     // it even if the window has fixed size.
     if (data.window_flags & Qt::CustomizeWindowHint &&
@@ -1688 +1717 @@
 void QWidgetPrivate::createTLSysExtra()
 {
+
     extra->topextra->savedFlags = 0;
     extra->topextra->winIconBig = 0;
@@ -1861 +1891 @@
     if (!function_resolved) {
         ptrSetLayeredWindowAttributes =
-            (PtrSetLayeredWindowAttributes) QLibrary::resolve(QLatin1String("user32"),
+            (PtrSetLayeredWindowAttributes) QLibrary::resolve(QLatin1String("user32"),
                                                               "SetLayeredWindowAttributes");
         function_resolved = true;
@@ -2048 +2078 @@
 void QWidgetPrivate::winSetupGestures()
 {
-#if !defined(QT_NO_NATIVE_GESTURES)
+#if !defined(QT_NO_NATIVE_GESTURES)
     Q_Q(QWidget);
     if (!q || !q->isVisible() || !nativeGesturePanEnabled)