diff --git a/common/view/view_group.cpp b/common/view/view_group.cpp index f7ff19da96..8f1eb82b03 100644 --- a/common/view/view_group.cpp +++ b/common/view/view_group.cpp @@ -73,6 +73,14 @@ void VIEW_GROUP::Clear() updateBbox(); } +void VIEW_GROUP::FreeItems() +{ + BOOST_FOREACH( VIEW_ITEM* item, m_items ) + { + delete item; + } + m_items.clear(); +} unsigned int VIEW_GROUP::GetSize() const { @@ -125,15 +133,6 @@ void VIEW_GROUP::ViewGetLayers( int aLayers[], int& aCount ) const } -void VIEW_GROUP::ViewUpdate( int aUpdateFlags, bool aForceImmediateRedraw ) -{ - BOOST_FOREACH( VIEW_ITEM* item, m_items ) - { - item->ViewUpdate( aUpdateFlags, aForceImmediateRedraw ); - } -} - - void VIEW_GROUP::updateBbox() { // Save the used VIEW, as it used nulled during Remove() diff --git a/include/view/view_group.h b/include/view/view_group.h index 4439234e0d..1f50da5046 100644 --- a/include/view/view_group.h +++ b/include/view/view_group.h @@ -121,7 +121,7 @@ public: virtual void ViewGetLayers( int aLayers[], int& aCount ) const; /// @copydoc VIEW_ITEM::ViewUpdate() - virtual void ViewUpdate( int aUpdateFlags, bool aForceImmediateRedraw ); + //virtual void ViewUpdate( int aUpdateFlags, bool aForceImmediateRedraw ); /** * Function SetLayer() @@ -134,6 +134,13 @@ public: m_layer = aLayer; } + void FreeItems(); + + KiGfx::VIEW *GetView() const + { + return m_view; + } + protected: /// These functions cannot be used with VIEW_GROUP as they are intended only to work with /// singular VIEW_ITEMs (there is only one-to-one relation between item/layer combination and