diff options
| author | Timothy Pearson <[email protected]> | 2012-08-05 01:00:53 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-08-05 01:00:53 -0500 |
| commit | 0008bc5bcd95694b38b0d0322aac2ea6fdb21298 (patch) | |
| tree | e36a2a63a9784451af847fc952b281969cb8c0c0 /src/styles/qwindowsstyle.h | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-0008bc5bcd95694b38b0d0322aac2ea6fdb21298.tar.gz qt3-0008bc5bcd95694b38b0d0322aac2ea6fdb21298.zip | |
Update style API to function without an active widget object
Diffstat (limited to 'src/styles/qwindowsstyle.h')
| -rw-r--r-- | src/styles/qwindowsstyle.h | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/src/styles/qwindowsstyle.h b/src/styles/qwindowsstyle.h index 5ad82b0..d0b400c 100644 --- a/src/styles/qwindowsstyle.h +++ b/src/styles/qwindowsstyle.h @@ -74,6 +74,8 @@ public: // new stuff void drawPrimitive( PrimitiveElement pe, QPainter *p, + QStyleControlElementData ceData, + ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags flags = Style_Default, @@ -81,15 +83,18 @@ public: void drawControl( ControlElement element, QPainter *p, - const QWidget *widget, + QStyleControlElementData ceData, + ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags flags = Style_Default, - const QStyleOption& = QStyleOption::Default ) const; + const QStyleOption& = QStyleOption::Default, + const QWidget *widget = 0 ) const; void drawComplexControl( ComplexControl control, QPainter* p, - const QWidget* widget, + QStyleControlElementData ceData, + ControlElementFlags elementFlags, const QRect& r, const QColorGroup& cg, SFlags flags = Style_Default, @@ -99,24 +104,31 @@ public: SCFlags sub = (uint)SC_All, #endif SCFlags subActive = SC_None, - const QStyleOption& = QStyleOption::Default ) const; + const QStyleOption& = QStyleOption::Default, + const QWidget* widget = 0 ) const; int pixelMetric( PixelMetric metric, + QStyleControlElementData ceData, + ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; QSize sizeFromContents( ContentsType contents, - const QWidget *widget, + QStyleControlElementData ceData, + ControlElementFlags elementFlags, const QSize &contentsSize, - const QStyleOption& = QStyleOption::Default ) const; + const QStyleOption& = QStyleOption::Default, + const QWidget *widget = 0 ) const; - int styleHint(StyleHint sh, const QWidget *, const QStyleOption & = QStyleOption::Default, - QStyleHintReturn* = 0) const; + int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default, + QStyleHintReturn* = 0, const QWidget* = 0) const; QPixmap stylePixmap( StylePixmap stylepixmap, - const QWidget *widget = 0, - const QStyleOption& = QStyleOption::Default ) const; + QStyleControlElementData ceData, + ControlElementFlags elementFlags, + const QStyleOption& = QStyleOption::Default, + const QWidget *widget = 0 ) const; - QRect subRect( SubRect r, const QWidget *widget ) const; + QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const; private: |