sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #350 from matthias-kuhn/qgsmessagebar

Browse Source 
Transfer ownership of widgets to C++ when pushed to the QgsMessageBar
This commit is contained in:
Martin Dobias 2012-12-28 04:23:16 -08:00
commit 5df8f2cb06
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/gui/qgsmessagebar.sip
View File

@ -13,7 +13,7 @@ class QgsMessageBar: QFrame
* @param widget widget to add
* @param level is 0 for information, 1 for warning, 2 for critical
*/
void pushWidget( QWidget *widget, int level = 0 );
void pushWidget( QWidget *widget /Transfer/, int level = 0 );
/*! remove the passed widget from the bar (if previously added),
* then display the next one in the stack if any or hide the bar

10
src/gui/qgsmessagebar.cpp
View File

@ -90,6 +90,11 @@ void QgsMessageBar::popItem( QgsMessageBarItem *item )
{
mLayout->removeWidget( mCurrentItem->widget() );
mCurrentItem->widget()->hide();
if ( mCurrentItem->widget()->parent() == this )
{
delete mCurrentItem->widget();
}
delete mCurrentItem;
mCurrentItem = 0;
}
@ -126,6 +131,10 @@ bool QgsMessageBar::popWidget( QWidget *widget )
if ( item->widget() == widget )
{
mList.removeOne( item );
if ( item->widget()->parent() == this )
{
delete item->widget();
}
delete item;
return true;
}
@ -141,7 +150,6 @@ bool QgsMessageBar::popWidget()
QgsMessageBarItem *item = mCurrentItem;
popItem( item );
delete item;
return true;
}