summaryrefslogtreecommitdiffstats
path: root/src/styles/qmotifstyle.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/styles/qmotifstyle.h')
-rw-r--r--src/styles/qmotifstyle.h40
1 files changed, 25 insertions, 15 deletions
diff --git a/src/styles/qmotifstyle.h b/src/styles/qmotifstyle.h
index c26337c..213795f 100644
--- a/src/styles/qmotifstyle.h
+++ b/src/styles/qmotifstyle.h
@@ -67,14 +67,16 @@ public:
bool useHighlightColors() const;
void polish( QPalette& );
- void polish( QWidget* );
- void polish( QApplication* );
+ void polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+ void applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
void polishPopupMenu( QPopupMenu* );
// new style API
void drawPrimitive( PrimitiveElement pe,
QPainter *p,
+ QStyleControlElementData ceData,
+ ControlElementFlags elementFlags,
const QRect &r,
const QColorGroup &cg,
SFlags flags = Style_Default,
@@ -82,15 +84,18 @@ public:
void drawControl( ControlElement element,
QPainter *p,
- const QWidget *widget,
+ QStyleControlElementData ceData,
+ ControlElementFlags elementFlags,
const QRect &r,
const QColorGroup &cg,
SFlags how = 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 how = Style_Default,
@@ -100,26 +105,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;
QRect querySubControlMetrics( ComplexControl control,
- const QWidget *widget,
+ QStyleControlElementData ceData,
+ ControlElementFlags elementFlags,
SubControl sc,
- const QStyleOption& = QStyleOption::Default ) const;
+ const QStyleOption& = QStyleOption::Default,
+ const QWidget *widget = 0 ) const;
- int pixelMetric( PixelMetric metric, 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;
- QRect subRect( SubRect r, const QWidget *widget ) const;
+ QRect subRect( SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const;
- QPixmap stylePixmap(StylePixmap, const QWidget * = 0, const QStyleOption& = QStyleOption::Default) const;
+ QPixmap stylePixmap(StylePixmap, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption& = QStyleOption::Default, const QWidget * = 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;
private:
bool highlightCols;