diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-15 12:46:17 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-15 12:46:17 -0600 |
| commit | c4fcfaa593835ff3568310c6937f47d69196f281 (patch) | |
| tree | d65fcc9cdf7182890ac0b3669be5f09c6968e6ce /src/kernel/qwidget.cpp | |
| parent | 6bcbe0a787127751122109caf4a3cd621e13004e (diff) | |
| parent | 5e04c37a6ce7a090adb9e6ea02a04761dea8a33e (diff) | |
| download | qt3-c4fcfaa593835ff3568310c6937f47d69196f281.tar.gz qt3-c4fcfaa593835ff3568310c6937f47d69196f281.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/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 28328b8..704681d 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -1184,6 +1184,9 @@ void QWidget::createExtra() #endif extra->size_policy = QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); + + extra->m_ceData = NULL; + createSysExtra(); } } @@ -3591,7 +3594,15 @@ bool QWidget::isActiveWindow() const if(tlw == qApp->activeWindow() || ( isVisible() && tlw->isPopup() )) return TRUE; #ifndef QT_NO_STYLE - if(style().styleHint(QStyle::SH_Widget_ShareActivation, this )) { + const_cast<QWidget*>(this)->createExtra(); + if (!extra->m_ceData) { + const_cast<QWidget*>(this)->extra->m_ceData = new QStyleControlElementData(); + } + //extra->m_ceData->widgetObjectTypes = getObjectTypeListForObject(this); + extra->m_ceData->widgetObjectTypes.clear(); + extra->m_ceData->allDataPopulated = false; + //if(style().styleHint(QStyle::SH_Widget_ShareActivation, *extra->m_ceData, getControlElementFlagsForObject(this, extra->m_ceData->widgetObjectTypes, QStyleOption(), false), QStyleOption(), NULL, this)) { + if(style().styleHint(QStyle::SH_Widget_ShareActivation, *extra->m_ceData, QStyle::CEF_None, QStyleOption(), NULL, this)) { if((tlw->isDialog() || (tlw->testWFlags(Qt::WStyle_Tool) && !tlw->isPopup())) && !tlw->testWFlags(Qt::WShowModal) && (!tlw->parentWidget() || tlw->parentWidget()->isActiveWindow())) |