summaryrefslogtreecommitdiffstats
path: root/styles
diff options
context:
space:
mode:
Diffstat (limited to 'styles')
-rw-r--r--styles/dotnet/dotnet.cpp18
-rw-r--r--styles/phase/phasestyle.cpp22
2 files changed, 20 insertions, 20 deletions
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 5972a0ce..9c42ccb4 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -1120,7 +1120,7 @@ void dotNETstyle::drawControl(TQ_ControlElement element,
}
if (!pb->text().isEmpty()) {
- p->setPen(enabled ? cg.foreground() : pb->tqpalette().disabled().buttonText());
+ p->setPen(enabled ? cg.foreground() : pb->palette().disabled().buttonText());
p->drawText(ur, text_flags, pb->text());
}
@@ -1629,7 +1629,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
pe = PE_SpinWidgetUp;
TQRect re = sw->upRect();
- TQColorGroup ucg = sw->isUpEnabled() ? cg : sw->tqpalette().disabled();
+ TQColorGroup ucg = sw->isUpEnabled() ? cg : sw->palette().disabled();
p->fillRect(re.x() + 1, re.y() + 1, re.width() - 2, re.height() - 1, flags & Style_Raised ? ucg.background() : ucg.highlight());
if (pseudo3D) {
const TQCOORD corners[] = { re.x(), re.bottom(), re.x(), re.y() + 1, re.x() + 1, re.y(), re.right() - 1, re.y(), re.right(), re.y() + 1, re.right(), re.bottom() };
@@ -1661,7 +1661,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
pe = PE_SpinWidgetDown;
TQRect re = sw->downRect();
- TQColorGroup dcg = sw->isDownEnabled() ? cg : sw->tqpalette().disabled();
+ TQColorGroup dcg = sw->isDownEnabled() ? cg : sw->palette().disabled();
p->fillRect(re.x() + 1, re.y(), re.width() - 2, re.height() - 1, flags & Style_Raised ? dcg.background() : dcg.highlight());
if (pseudo3D) {
const TQCOORD corners[] = {
@@ -2011,7 +2011,7 @@ void dotNETstyle::paletteChanged()
void dotNETstyle::updatePalette( TQComboBox *combo )
{
- TQPalette pal = TQApplication::tqpalette();
+ TQPalette pal = TQApplication::palette();
pal.setColor(TQColorGroup::Dark,
pal.active().color(TQColorGroup::Base));
pal.setColor(TQColorGroup::Midlight,
@@ -2021,7 +2021,7 @@ void dotNETstyle::updatePalette( TQComboBox *combo )
void dotNETstyle::updatePalette( TQToolBar *bar )
{
- TQPalette pal = TQApplication::tqpalette();
+ TQPalette pal = TQApplication::palette();
pal.setColor(TQColorGroup::Button,
pal.active().color(TQColorGroup::Background));
bar->setPalette(pal);
@@ -2029,7 +2029,7 @@ void dotNETstyle::updatePalette( TQToolBar *bar )
void dotNETstyle::updatePalette( TQMenuBar *bar )
{
- TQPalette pal = TQApplication::tqpalette();
+ TQPalette pal = TQApplication::palette();
pal.setColor(TQColorGroup::Button,
pal.active().color(TQColorGroup::Background));
bar->setPalette(pal);
@@ -2046,7 +2046,7 @@ bool dotNETstyle::eventFilter(TQObject *obj, TQEvent *ev)
if (ev->type() == TQEvent::Enter) {
TQWidget *btn = (TQWidget *)obj;
if (btn->isEnabled()) {
- TQPalette pal = btn->tqpalette();
+ TQPalette pal = btn->palette();
pal.setColor(TQColorGroup::Dark,
pal.active().color(TQColorGroup::Highlight).dark());
pal.setColor(TQColorGroup::Midlight,
@@ -2055,7 +2055,7 @@ bool dotNETstyle::eventFilter(TQObject *obj, TQEvent *ev)
}
} else if (ev->type() == TQEvent::Leave) {
TQWidget *btn = (TQWidget *)obj;
- TQPalette pal = btn->tqpalette();
+ TQPalette pal = btn->palette();
pal.setColor(TQColorGroup::Dark,
pal.active().color(TQColorGroup::Base));
pal.setColor(TQColorGroup::Midlight,
@@ -2064,7 +2064,7 @@ bool dotNETstyle::eventFilter(TQObject *obj, TQEvent *ev)
}
} else if (obj->inherits(TQBUTTON_OBJECT_NAME_STRING)) {
TQWidget *btn = (TQWidget *)obj;
- TQPalette pal = btn->tqpalette();
+ TQPalette pal = btn->palette();
pal.setColor(TQColorGroup::Button,
pal.active().color(TQColorGroup::Background));
btn->setPalette(pal);
diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp
index 5205ab2a..e2d66ecd 100644
--- a/styles/phase/phasestyle.cpp
+++ b/styles/phase/phasestyle.cpp
@@ -727,8 +727,8 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element,
case PE_Indicator:
drawPhasePanel(painter, x+1, y+1, w-2, h-2, group, true, enabled ?
- &group.tqbrush(TQColorGroup::Base) :
- &group.tqbrush(TQColorGroup::Background));
+ &group.brush(TQColorGroup::Base) :
+ &group.brush(TQColorGroup::Background));
if (on) {
painter->setPen(mouseover
@@ -736,7 +736,7 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element,
: group.dark());
painter->drawRect(x+4, y+4, w-8, h-8);
painter->fillRect(x+5, y+5, w-10, h-10,
- group.tqbrush(TQColorGroup::Highlight));
+ group.brush(TQColorGroup::Highlight));
} else if (mouseover) {
painter->setPen(TQColor(group.highlight().dark(contrast)));
painter->drawRect(x+4, y+4, w-8, h-8);
@@ -804,7 +804,7 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element,
case PE_DockWindowResizeHandle:
drawPhasePanel(painter, x, y, w, h, group, false,
- &group.tqbrush(TQColorGroup::Background));
+ &group.brush(TQColorGroup::Background));
break;
case PE_Splitter:
@@ -1095,7 +1095,7 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element,
}
}
drawPhasePanel(painter, x, y, w, h, group, true,
- &group.tqbrush(TQColorGroup::Mid));
+ &group.brush(TQColorGroup::Mid));
break;
}
@@ -1157,7 +1157,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
if ((flags & Style_ButtonDefault) && !depress) {
drawPhasePanel(painter, x, y, w, h, group, true,
- &group.tqbrush(TQColorGroup::Mid));
+ &group.brush(TQColorGroup::Mid));
drawPhaseBevel(painter, x+bd, y+bd, w-bd*2, h-bd*2, group,
(widget==hover_)
? TQColor(group.button().light(contrast))
@@ -1306,7 +1306,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
if ((flags & Style_Active) && (flags & Style_HasFocus)) {
if (flags & Style_Down) {
drawPhasePanel(painter, x, y, w, h, group, true,
- &group.tqbrush(TQColorGroup::Background));
+ &group.brush(TQColorGroup::Background));
} else {
drawPhaseBevel(painter, x, y, w, h,
group, group.background(),
@@ -1504,7 +1504,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
case CE_ProgressBarGroove: {
drawPhasePanel(painter, x, y, w, h, group, true,
- &group.tqbrush(TQColorGroup::Base));
+ &group.brush(TQColorGroup::Base));
break;
}
@@ -1648,8 +1648,8 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
int slot = TQMAX(h/4, 6) + (h % 2);
drawPhasePanel(painter, x+3, y+(h/2)-(slot/2), w-6,
slot, group, true,
- sunken ? &group.tqbrush(TQColorGroup::Midlight)
- : &group.tqbrush(TQColorGroup::Mid));
+ sunken ? &group.brush(TQColorGroup::Midlight)
+ : &group.brush(TQColorGroup::Mid));
}
if (controls & SC_ComboBoxEditField) { // draw edit box
@@ -1905,7 +1905,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
// now draw active buttons
if (down || on) {
drawPhasePanel(painter, x, y, w, h, group, true,
- &group.tqbrush(TQColorGroup::Button));
+ &group.brush(TQColorGroup::Button));
} else if (raised) {
drawPhaseBevel(painter, x, y, w, h, group, group.button(),
false, !horiz, true);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-03 09:19:00 +0000