diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-10 23:20:54 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-10 23:20:54 -0500 |
| commit | 9e635fc49d218b4b5fda27fadaa1bcd21df25063 (patch) | |
| tree | 49062b13564db574a8655516d109544c595c13f0 /style/qtcurve.cpp | |
| parent | 6569299577632790314dbf4c47e24c54a8f3b94b (diff) | |
| download | tde-style-qtcurve-9e635fc49d218b4b5fda27fadaa1bcd21df25063.tar.gz tde-style-qtcurve-9e635fc49d218b4b5fda27fadaa1bcd21df25063.zip | |
Fix QtCurve hang in menu headers
Clean up spurious build files
Diffstat (limited to 'style/qtcurve.cpp')
| -rw-r--r-- | style/qtcurve.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp index 0c8391a..db4f8c7 100644 --- a/style/qtcurve.cpp +++ b/style/qtcurve.cpp @@ -3240,7 +3240,7 @@ void QtCurveStyle::drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQS } else if(0==flags) // Header on popup menu? { TQWidget *widget(p && p->device() ? dynamic_cast<TQWidget*>(p->device()) : 0L); - bool menuTitle(widget && 0==qstrcmp(ceData.widgetObjectTypes[ceData.widgetObjectTypes.count()-1].ascii(), "TDEPopupTitle")); + bool menuTitle(widget && (ceData.widgetObjectTypes.count() > 0) && 0==qstrcmp(ceData.widgetObjectTypes[ceData.widgetObjectTypes.count()-1].ascii(), "TDEPopupTitle")); const TQColor *use(buttonColors(cg)); TQRect r2(r); @@ -4206,7 +4206,7 @@ void QtCurveStyle::drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQS { TQWidget *widget(dynamic_cast<TQWidget*>(p->device())); - if(widget && 0==qstrcmp(ceData.widgetObjectTypes[ceData.widgetObjectTypes.count()-1], "TQViewportWidget") && + if(widget && (ceData.widgetObjectTypes.count() > 0) && 0==qstrcmp(ceData.widgetObjectTypes[ceData.widgetObjectTypes.count()-1], "TQViewportWidget") && widget->parentWidget() && ::tqqt_cast<TQListBox *>(widget->parentWidget()) && widget->parentWidget()->parentWidget() && ::tqqt_cast<TQComboBox *>(widget->parentWidget()->parentWidget())) { @@ -4654,7 +4654,7 @@ void QtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQSty firstTab(0==tabIndex), lastTab((ceData.tabBarData.tabCount-1)==tabIndex), // isFirstKTabCtlTab(firstTab && widget->parent() -// ? 0==qstrcmp("KTabCtl", ceData.parentWidgetData.objectTypes[ceData.widgetObjectTypes.count()-1]) +// ? ((ceData.widgetObjectTypes.count() > 0) && 0==qstrcmp("KTabCtl", ceData.parentWidgetData.objectTypes[ceData.widgetObjectTypes.count()-1])) // : false), active(flags & Style_Selected), itsHover(itsHoverTab && itsHoverTab->isEnabled() && data.tab()==itsHoverTab && |