Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/11/head
Michele Calgaro 10 months ago
parent 738600dec8
commit 31149c65cc
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -13,7 +13,7 @@ bool LiquidStyle::objectEventHandler( const TQStyleControlElementData &ceData,
return true;
}
if (!ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
if (!ceData.widgetObjectTypes.contains("TQObject")) {
return false;
}
TQObject* obj = reinterpret_cast<TQObject*>(source);

@ -206,7 +206,7 @@ void LiquidStyle::polish( TQPalette &pal )
void LiquidStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
popupBack.resize(0,0);
TQPalette pal( app->palette() );
@ -236,7 +236,7 @@ void LiquidStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
// if (w->sizePolicy().horData() == TQSizePolicy::Minimum || w->sizePolicy().horData() == TQSizePolicy::MinimumExpanding)
// tqWarning("%s, \"%s\"",w->className(), w->name());
// installObjectEventHandler(ceData, elementFlags, ptr, this);
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
bool tmpBool = false;
@ -755,7 +755,7 @@ void LiquidStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
void LiquidStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) {
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
bool isViewport;

Loading…
Cancel
Save