summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
-rw-r--r--src/gui/kernel/qwidget_p.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 423e833..ec64b6e 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -90,6 +90,12 @@ class QWSManager;
#if defined(Q_WS_MAC)
class QCoreGraphicsPaintEnginePrivate;
#endif
+#if defined(Q_WS_S60)
+class RDrawableWindow;
+class CCoeControl;
+class CAknTitlePane;
+class CAknContextPane;
+#endif
class QPaintEngine;
class QPixmap;
class QWidgetBackingStore;
@@ -142,6 +148,10 @@ struct QTLWExtra {
uint isMove : 1;
uint embedded : 1;
#endif
+#if defined(Q_WS_S60)
+ uint activated : 1; // RWindowBase::Activated has been called
+ RDrawableWindow *rwindow;
+#endif
#if defined(Q_WS_QWS) && !defined (QT_NO_QWS_MANAGER)
QWSManager *qwsManager;
#endif
@@ -364,7 +374,7 @@ public:
void x11UpdateIsOpaque();
#endif
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_S60)
void reparentChildren();
#endif
@@ -594,7 +604,7 @@ public:
uint isGLWidget : 1;
#endif
-#if defined(Q_WS_X11) || defined (Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined (Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_S60)
#ifdef Q_WS_MAC
void setWSGeometry(bool dontShow=false, const QRect &oldRect = QRect());
#else
@@ -622,7 +632,7 @@ public:
QSizePolicy size_policy;
QLocale locale;
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) || defined(Q_WS_S60)
static QWidget *mouseGrabber;
static QWidget *keyboardGrabber;
#endif
@@ -667,6 +677,7 @@ public:
}
QSize adjustedSize() const;
+
};
inline QWExtra *QWidgetPrivate::extraData() const