diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-08-11 13:41:02 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-08-11 13:41:02 -0500 |
| commit | 2c1bb83ad60d4c376302f70d6c55ca9dcf7db548 (patch) | |
| tree | b89be331369ebdadb1e351df71765071061b7901 /tdestyles/keramik | |
| parent | 32f50cd6f959faf422b389d2d0b52e0930a78c09 (diff) | |
| download | tdelibs-2c1bb83ad60d4c376302f70d6c55ca9dcf7db548.tar.gz tdelibs-2c1bb83ad60d4c376302f70d6c55ca9dcf7db548.zip | |
Use proper toolbar extension widget name when detecting widget inheritance
This relates to Bug 1693
Diffstat (limited to 'tdestyles/keramik')
| -rw-r--r-- | tdestyles/keramik/keramik.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index f3a5ee033..08d6c592c 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -360,7 +360,7 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen listbox->setBackgroundMode( NoBackground ); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (widget->inherits("QToolBarExtensionWidget")) { + } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { installObjectEventHandler(ceData, elementFlags, ptr, this); //widget->setBackgroundMode( NoBackground ); } @@ -405,7 +405,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem listbox->setBackgroundMode( PaletteBackground ); removeObjectEventHandler(ceData, elementFlags, ptr, this); widget->clearMask(); - } else if (widget->inherits("QToolBarExtensionWidget")) { + } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } else if ( !qstrcmp( widget->name(), kdeToolbarWidget ) ) { @@ -2258,7 +2258,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, case CC_ToolButton: { bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING); bool onExtender = !onToolbar && - ceData.parentWidgetData.widgetObjectTypes.contains( "QToolBarExtensionWidget") && + ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING) && widget && widget->parentWidget()->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); bool onControlButtons = false; |