summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/kexiutils/styleproxy.h80
-rw-r--r--kexi/widget/tableview/kexitableviewheader.cpp6
2 files changed, 43 insertions, 43 deletions
diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h
index cf3eea50..5cf0c2bb 100644
--- a/kexi/kexiutils/styleproxy.h
+++ b/kexi/kexiutils/styleproxy.h
@@ -57,15 +57,15 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
TQStyle* parentStyle() const;
void setParentStyle(TQStyle* style);
- virtual void polish( TQWidget *w ) { m_style->polish(w); }
- virtual void unPolish( TQWidget *w ) { m_style->unPolish(w); }
+ virtual void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->polish(ceData, elementFlags, ptr); }
+ virtual void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->unPolish(ceData, elementFlags, ptr); }
- virtual void polish( TQApplication *a ) { m_style->polish(a); }
- virtual void unPolish( TQApplication *a ) { m_style->unPolish(a); }
+ virtual void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->applicationPolish(ceData, elementFlags, ptr); }
+ virtual void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->applicationUnPolish(ceData, elementFlags, ptr); }
virtual void polish( TQPalette &p ) { m_style->polish(p); };
- virtual void polishPopupMenu( TQPopupMenu* p ) { m_style->polishPopupMenu(p); }
+ virtual void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->polishPopupMenu(ceData, elementFlags, ptr); }
virtual TQRect itemRect( TQPainter *p, const TQRect &r,
int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const
@@ -80,91 +80,91 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
m_style->drawItem( p, r, flags, g, enabled, pixmap, text, len, penColor );
}
- virtual void tqdrawPrimitive( TQ_PrimitiveElement pe,
- TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default,
+ virtual void drawPrimitive( TQ_PrimitiveElement pe,
+ TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default,
const TQStyleOption& option = TQStyleOption::Default ) const
{
- m_style->tqdrawPrimitive( pe, p, r, cg, flags, option );
+ m_style->drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, option );
}
virtual void drawControl( TQ_ControlElement element,
- TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg,
- SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const
+ TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
+ SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- m_style->drawControl( element, p, widget, r, cg, how, option );
+ m_style->drawControl( element, p, ceData, elementFlags, r, cg, how, option, widget );
}
virtual void drawControlMask( TQ_ControlElement element,
- TQPainter *p, const TQWidget *widget, const TQRect &r,
- const TQStyleOption& option = TQStyleOption::Default ) const
+ TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+ const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- m_style->drawControlMask( element, p, widget, r, option );
+ m_style->drawControlMask( element, p, ceData, elementFlags, r, option, widget );
}
- virtual TQRect subRect( SubRect r, const TQWidget *widget ) const
+ virtual TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const
{
- return m_style->subRect( r, widget );
+ return m_style->subRect( r, ceData, elementFlags, widget );
}
virtual void drawComplexControl( TQ_ComplexControl control,
- TQPainter *p, const TQWidget *widget, const TQRect &r,
+ TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQColorGroup &cg, SFlags how = Style_Default,
#ifdef TQ_TQDOC
SCFlags sub = SC_All,
#else
SCFlags sub = (uint)SC_All,
#endif
- SCFlags subActive = SC_None, const TQStyleOption& option = TQStyleOption::Default ) const
+ SCFlags subActive = SC_None, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- drawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
+ drawComplexControl( control, p, ceData, elementFlags, r, cg, how, sub, subActive, option, widget );
}
virtual void drawComplexControlMask( TQ_ComplexControl control,
- TQPainter *p, const TQWidget *widget, const TQRect &r,
- const TQStyleOption& option = TQStyleOption::Default ) const
+ TQPainter *p, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQRect &r,
+ const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- m_style->drawComplexControlMask( control, p, widget, r, option );
+ m_style->drawComplexControlMask( control, p, ceData, elementFlags, r, option, widget );
}
virtual TQRect querySubControlMetrics( TQ_ComplexControl control,
- const TQWidget *widget, SubControl sc,
- const TQStyleOption& option = TQStyleOption::Default ) const
+ TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl sc,
+ const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- return m_style->querySubControlMetrics( control, widget, sc, option );
+ return m_style->querySubControlMetrics( control, ceData, elementFlags, sc, option, widget );
}
virtual SubControl querySubControl( TQ_ComplexControl control,
- const TQWidget *widget, const TQPoint &pos,
- const TQStyleOption& option = TQStyleOption::Default ) const
+ TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQPoint &pos,
+ const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- return m_style->querySubControl( control, widget, pos, option );
+ return m_style->querySubControl( control, ceData, elementFlags, pos, option, widget );
}
- virtual int pixelMetric( PixelMetric metric,
+ virtual int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const
{
- return m_style->pixelMetric( metric, widget );
+ return m_style->pixelMetric( metric, ceData, elementFlags, widget );
}
- virtual TQSize tqsizeFromContents( ContentsType contents,
- const TQWidget *widget, const TQSize &contentsSize,
- const TQStyleOption& option = TQStyleOption::Default ) const
+ virtual TQSize sizeFromContents( ContentsType contents,
+ TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &contentsSize,
+ const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- return m_style->tqsizeFromContents( contents, widget, contentsSize, option );
+ return m_style->sizeFromContents( contents, ceData, elementFlags, contentsSize, option, widget );
}
virtual int styleHint( TQ_StyleHint stylehint,
- const TQWidget *widget = 0, const TQStyleOption& option = TQStyleOption::Default,
- TQStyleHintReturn* returnData = 0 ) const
+ TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption& option = TQStyleOption::Default,
+ TQStyleHintReturn* returnData = 0, const TQWidget *widget = 0 ) const
{
- return m_style->styleHint( stylehint, widget, option, returnData );
+ return m_style->styleHint( stylehint, ceData, elementFlags, option, returnData, widget );
}
virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
- const TQWidget *widget = 0,
- const TQStyleOption& option = TQStyleOption::Default ) const
+ TQStyleControlElementData ceData, ControlElementFlags elementFlags,
+ const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
- return m_style->stylePixmap( stylepixmap, widget, option );
+ return m_style->stylePixmap( stylepixmap, ceData, elementFlags, option, widget );
}
protected:
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index d4b64127..a313c1e5 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -38,7 +38,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
}
~KexiTableViewHeaderStyle() {}
- virtual void tqdrawPrimitive( TQ_PrimitiveElement pe,
+ virtual void drawPrimitive( TQ_PrimitiveElement pe,
TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default,
const TQStyleOption& option = TQStyleOption::Default ) const
{
@@ -46,10 +46,10 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
TQColorGroup newCg(cg);
newCg.setColor(TQColorGroup::Button, m_backgroundColor);
newCg.setColor(TQColorGroup::Background, m_backgroundColor); //set background color as well (e.g. for thinkeramik)
- m_style->tqdrawPrimitive( pe, p, r, newCg, flags, option );
+ m_style->drawPrimitive( pe, p, r, newCg, flags, option );
return;
}
- m_style->tqdrawPrimitive( pe, p, r, cg, flags, option );
+ m_style->drawPrimitive( pe, p, r, cg, flags, option );
}
void setBackgroundColor( const TQColor& color ) { m_backgroundColor = color; }
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 13:41:22 +0000