1 files changed, 67 insertions, 1 deletions

diff --git a/src/widgets/styles/qwindowsxpstyle_p_p.h b/src/widgets/styles/qwindowsxpstyle_p_p.h
index 190055b24b..0ead58393f 100644
--- a/src/widgets/styles/qwindowsxpstyle_p_p.h
+++ b/src/widgets/styles/qwindowsxpstyle_p_p.h
@@ -219,9 +219,19 @@ public:
     HRGN mask(QWidget *widget);
     HTHEME handle();
 
-    RECT toRECT(const QRect &qr);
+    static RECT toRECT(const QRect &qr);
     bool isValid();
 
+    QSize size();
+    QMargins margins(const QRect &rect, int propId = TMT_CONTENTMARGINS);
+    QMargins margins(int propId = TMT_CONTENTMARGINS);
+
+    static QSize themeSize(const QWidget *w = 0, QPainter *p = 0, int themeIn = -1, int part = 0, int state = 0);
+    static QMargins themeMargins(const QRect &rect, const QWidget *w = 0, QPainter *p = 0, int themeIn = -1,
+                                 int part = 0, int state = 0, int propId = TMT_CONTENTMARGINS);
+    static QMargins themeMargins(const QWidget *w = 0, QPainter *p = 0, int themeIn = -1,
+                                 int part = 0, int state = 0, int propId = TMT_CONTENTMARGINS);
+
     const QWidget *widget;
     QPainter *painter;
 
@@ -374,6 +384,8 @@ public:
     ~QWindowsXPStylePrivate()
     { cleanup(); }
 
+    static int pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0);
+
     static HWND winId(const QWidget *widget);
 
     void init(bool force = false);
@@ -432,6 +444,60 @@ private:
     static HTHEME m_themes[NThemes];
 };
 
+inline QSize XPThemeData::size()
+{
+    QSize result(0, 0);
+    if (isValid()) {
+        SIZE size;
+        if (SUCCEEDED(QWindowsXPStylePrivate::pGetThemePartSize(handle(), 0, partId, stateId, 0, TS_TRUE, &size)))
+            result = QSize(size.cx, size.cy);
+    }
+    return result;
+}
+
+inline QMargins XPThemeData::margins(const QRect &qRect, int propId)
+{
+    QMargins result(0, 0, 0 ,0);
+    if (isValid()) {
+        MARGINS margins;
+        RECT rect = XPThemeData::toRECT(qRect);
+        if (SUCCEEDED(QWindowsXPStylePrivate::pGetThemeMargins(handle(), 0, partId, stateId, propId, &rect, &margins)))
+            result = QMargins(margins.cxLeftWidth, margins.cyTopHeight, margins.cxRightWidth, margins.cyBottomHeight);
+    }
+    return result;
+}
+
+inline QMargins XPThemeData::margins(int propId)
+{
+    QMargins result(0, 0, 0 ,0);
+    if (isValid()) {
+        MARGINS margins;
+        if (SUCCEEDED(QWindowsXPStylePrivate::pGetThemeMargins(handle(), 0, partId, stateId, propId, NULL, &margins)))
+            result = QMargins(margins.cxLeftWidth, margins.cyTopHeight, margins.cxRightWidth, margins.cyBottomHeight);
+    }
+    return result;
+}
+
+inline QSize XPThemeData::themeSize(const QWidget *w, QPainter *p, int themeIn, int part, int state)
+{
+    XPThemeData theme(w, p, themeIn, part, state);
+    return theme.size();
+}
+
+inline QMargins XPThemeData::themeMargins(const QRect &rect, const QWidget *w, QPainter *p, int themeIn,
+                                          int part, int state, int propId)
+{
+    XPThemeData theme(w, p, themeIn, part, state);
+    return theme.margins(rect, propId);
+}
+
+inline QMargins XPThemeData::themeMargins(const QWidget *w, QPainter *p, int themeIn,
+                                          int part, int state, int propId)
+{
+    XPThemeData theme(w, p, themeIn, part, state);
+    return theme.margins(propId);
+}
+
 #endif // QT_NO_STYLE_WINDOWS
 
 QT_END_NAMESPACE