diff options
| author | Timothy Pearson <[email protected]> | 2012-11-14 23:46:03 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-11-14 23:46:03 -0600 |
| commit | 6241511abf822c12298be414b681ed03379c11b0 (patch) | |
| tree | e5f0e1ace609be2c6bedd26a9a95dc552f62b15d /src/kernel/qwidget.cpp | |
| parent | 367668d690ce2270f4d99f9a19ea800b6ea84a39 (diff) | |
| download | tqt3-6241511abf822c12298be414b681ed03379c11b0.tar.gz tqt3-6241511abf822c12298be414b681ed03379c11b0.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qwidget.cpp')
| -rw-r--r-- | src/kernel/qwidget.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index a29036c1f..f7ed299fb 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -1184,6 +1184,9 @@ void TQWidget::createExtra() #endif extra->size_policy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); + + extra->m_ceData = NULL; + createSysExtra(); } } @@ -3591,7 +3594,15 @@ bool TQWidget::isActiveWindow() const if(tlw == tqApp->activeWindow() || ( isVisible() && tlw->isPopup() )) return TRUE; #ifndef QT_NO_STYLE - if(style().styleHint(TQStyle::SH_Widget_ShareActivation, this )) { + const_cast<TQWidget*>(this)->createExtra(); + if (!extra->m_ceData) { + const_cast<TQWidget*>(this)->extra->m_ceData = new TQStyleControlElementData(); + } + //extra->m_ceData->widgetObjectTypes = getObjectTypeListForObject(this); + extra->m_ceData->widgetObjectTypes.clear(); + extra->m_ceData->allDataPopulated = false; + //if(style().styleHint(TQStyle::SH_Widget_ShareActivation, *extra->m_ceData, getControlElementFlagsForObject(this, extra->m_ceData->widgetObjectTypes, TQStyleOption(), false), TQStyleOption(), NULL, this)) { + if(style().styleHint(TQStyle::SH_Widget_ShareActivation, *extra->m_ceData, TQStyle::CEF_None, TQStyleOption(), NULL, this)) { if((tlw->isDialog() || (tlw->testWFlags(TQt::WStyle_Tool) && !tlw->isPopup())) && !tlw->testWFlags(TQt::WShowModal) && (!tlw->parentWidget() || tlw->parentWidget()->isActiveWindow())) |