Drop TQT_TQ*_OBJECT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/6/head
Michele Calgaro 1 year ago
parent 963d734449
commit 34553b6ef4
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -6110,9 +6110,9 @@ void QtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, cons
if(!sunken && !editable && !(opts.thin&THIN_FRAMES) && if(!sunken && !editable && !(opts.thin&THIN_FRAMES) &&
((MO_GLOW==opts.coloredMouseOver && flags&Style_MouseOver)/* || ((MO_GLOW==opts.coloredMouseOver && flags&Style_MouseOver)/* ||
(FOCUS_FULL==opts.focus && flags&Style_HasFocus)*/ || glowFocus)) (FOCUS_FULL==opts.focus && flags&Style_HasFocus)*/ || glowFocus))
drawGlow(p, widget ? TQT_TQRECT_OBJECT(ceData.rect) : r, cg, WIDGET_COMBO, glowFocus ? itsFocusCols : NULL); drawGlow(p, widget ? ceData.rect : r, cg, WIDGET_COMBO, glowFocus ? itsFocusCols : NULL);
else else
drawEtch(p, widget ? TQT_TQRECT_OBJECT(ceData.rect) : r, cg, drawEtch(p, widget ? ceData.rect : r, cg,
!editable && EFFECT_SHADOW==opts.buttonEffect && !sunken, editable && (opts.square&SQUARE_ENTRY)); !editable && EFFECT_SHADOW==opts.buttonEffect && !sunken, editable && (opts.square&SQUARE_ENTRY));
} }
@ -6246,7 +6246,7 @@ void QtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, cons
} }
if(doEtch) if(doEtch)
drawEtch(p, ceData.widgetObjectTypes.contains("TQSpinWidget") ? TQT_TQRECT_OBJECT(ceData.rect) : r, cg, false, (opts.square&SQUARE_ENTRY)); drawEtch(p, ceData.widgetObjectTypes.contains("TQSpinWidget") ? ceData.rect : r, cg, false, (opts.square&SQUARE_ENTRY));
} }
itsFormMode=false; itsFormMode=false;
break; break;

Loading…
Cancel
Save