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

Timestamp:

May 5, 2011, 5:36:53 AM (14 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_wince.cpp (modified) (7 diffs)

trunk/src/gui/kernel/qwidget_wince.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -47 +47 @@
 
 const QString qt_reg_winclass(QWidget *w);                // defined in qapplication_win.cpp
-extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
+extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
 
 //#define TABLET_DEBUG
@@ -64 +64 @@
 typedef BOOL    (API *PtrWTQueueSizeSet)(HCTX, int);
 
+#ifndef QT_NO_TABLETEVENT
 static void qt_tablet_init_wce();
 static void qt_tablet_cleanup_wce();
@@ -136 +137 @@
     qt_tablet_widget = 0;
 }
+#endif // QT_NO_TABLETEVENT
 
 
@@ -359 +361 @@
     }
 
+#ifndef QT_NO_TABLETEVENT
     if (q != qt_tablet_widget && QWidgetPrivate::mapper)
         qt_tablet_init_wce();
+#endif // QT_NO_TABLETEVENT
 
     if (q->testAttribute(Qt::WA_DropSiteRegistered))
@@ -495 +499 @@
                 SetWindowLong(internalWinId(), GWL_STYLE, style);
                 SetWindowLong(internalWinId(), GWL_EXSTYLE, GetWindowLong (internalWinId(), GWL_EXSTYLE) & ~ WS_EX_NODRAG);
+                qt_wince_unmaximize(this);
             }
             if (isVisible() && newstate & Qt::WindowMaximized)
@@ -587 +592 @@
 
 // The procedure does nothing, but is required for mousegrabbing to work
-LRESULT CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam) {
+LRESULT QT_WIN_CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam) {
     Q_UNUSED(nCode);
     Q_UNUSED(wParam);