Changeset 846 for trunk/src/gui/kernel/qwidget_p.h

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_p.h (modified) (16 diffs)

trunk/src/gui/kernel/qwidget_p.h

@@ -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])
@@ -115 +115 @@
 class QStyle;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 struct QTLWExtra {
     // *************************** Cross-platform variables *****************************
@@ -121 +163 @@
     QIcon *icon; // widget icon
     QPixmap *iconPixmap;
-    QWidgetBackingStore *backingStore;
+    QWidgetBackingStorebackingStore;
     QWindowSurface *windowSurface;
     QPainter *sharedPainter;
@@ -163 +205 @@
 #endif
 #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
+
     HICON winIconBig; // internal big Windows icon
     HICON winIconSmall; // internal small Windows icon
@@ -174 +217 @@
     IconRef windowIcon; // the current window icon, if set with setWindowIcon_sys.
     quint32 savedWindowAttributesFromMaximized; // Saved attributes from when the calling updateMaximizeButton_sys()
+
+
+
+
+
+
+
+
 #elif defined(Q_WS_QWS) // <--------------------------------------------------------- QWS
 #ifndef QT_NO_QWS_MANAGER
@@ -180 +231 @@
 #elif defined(Q_OS_SYMBIAN)
     uint inExpose : 1; // Prevents drawing recursion
+
 #elif defined(Q_WS_PM)
     HWND fId;
@@ -396 +448 @@
     void render_helper(QPainter *painter, const QPoint &targetOffset, const QRegion &sourceRegion,
                        QWidget::RenderFlags renderFlags);
+
+
     void drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QPoint &offset, int flags,
                     QPainter *sharedPainter = 0, QWidgetBackingStore *backingStore = 0);
@@ -502 +556 @@
     bool setMaximumSize_helper(int &maxw, int &maxh);
     void setConstraints_sys();
+
     QWidget *childAt_helper(const QPoint &, bool) const;
+
     void updateGeometry_helper(bool forceUpdate);
 
@@ -508 +564 @@
     void setLayoutItemMargins(int left, int top, int right, int bottom);
     void setLayoutItemMargins(QStyle::SubElement element, const QStyleOption *opt = 0);
+
+
+
+
+
 
     QInputContext *inputContext() const;
@@ -685 +746 @@
     QList<QAction*> actions;
 #endif
+
     QMap<Qt::GestureType, Qt::GestureFlags> gestureContext;
+
 
     // Bit fields.
-    uint high_attributes[3]; // the low ones are in QWidget::widget_attributes
+    uint high_attributes[]; // the low ones are in QWidget::widget_attributes
     QPalette::ColorRole fg_role : 8;
     QPalette::ColorRole bg_role : 8;
@@ -698 +761 @@
     uint isGLWidget : 1;
     uint usesDoubleBufferedGLContext : 1;
+
+
+
 
     // *************************** Platform specific ************************************
@@ -711 +777 @@
     void x11UpdateIsOpaque();
     bool isBackgroundInherited() const;
+
 #elif defined(Q_WS_PM) // <----------------------------------------------------------- PM
     uint noPaintOnScreen : 1; // see qwidget_pm.cpp ::paintEngine()
@@ -722 +789 @@
 #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
     uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine()
+
     uint nativeGesturePanEnabled : 1;
-
+#endif
     bool shouldShowMaximizeButton();
     void winUpdateIsOpaque();
@@ -737 +805 @@
     // This is new stuff
     uint needWindowChange : 1;
+
 
     // Each wiget keeps a list of all its child and grandchild OpenGL widgets.
@@ -783 +852 @@
     void finishCreateWindow_sys_Carbon(OSWindowRef windowRef);
 #else
+
+
     void finishCreateWindow_sys_Cocoa(void * /*NSWindow * */ windowRef);
     void syncCocoaMask();
     void finishCocoaMaskSetup();
+
+
+
+
+
+
+
 #endif
     void determineWindowClass();
@@ -923 +1001 @@
 }
 
+
+
+
+
+
+
+
 inline QWidgetBackingStore *QWidgetPrivate::maybeBackingStore() const
 {
     Q_Q(const QWidget);
     QTLWExtra *x = q->window()->d_func()->maybeTopData();
-    return x ? x->backingStore : 0;
+    return x ? x->backingStore : 0;
 }