--- a/uiacceltk/hitchcock/coretoolkit/src/HuiVisual.cpp Thu Jul 15 19:40:07 2010 +0300
+++ b/uiacceltk/hitchcock/coretoolkit/src/HuiVisual.cpp Thu Aug 19 10:48:02 2010 +0300
@@ -45,10 +45,12 @@
{
public: // Functions
// Constructor: initialize the data
- THuiVisualPrivateData() : iTacticons(), iDropShadow(NULL)
+ THuiVisualPrivateData()
+ : iTacticons(), iDropShadow(NULL), iEffect(NULL),
+ iEffectParser(NULL), iEffectable(NULL), iStoredRenderBuffer(NULL),
+ iStoredRenderBufferModificationsEnabled(ETrue),
+ iFreezed(EFalse)
{
- iEffect = NULL;
- iEffectParser = NULL;
}
// Destructor: destruct the data
@@ -228,7 +230,6 @@
{
iVisualData = new (ELeave) THuiVisualPrivateData;
iVisualData->iEffectable = new CHuiEffectable(this);
- iVisualData->iStoredRenderBuffer = NULL;
}
@@ -277,12 +278,15 @@
delete iBrushes;
delete iTag;
delete iTransform;
- delete iVisualData->iEffectable;
- if (iVisualData->iStoredRenderBuffer)
+ if (iVisualData)
{
- iVisualData->iStoredRenderBuffer->UnInitialize();
+ delete iVisualData->iEffectable;
+ if (iVisualData->iStoredRenderBuffer)
+ {
+ iVisualData->iStoredRenderBuffer->UnInitialize();
+ }
+ delete iVisualData->iStoredRenderBuffer;
}
- delete iVisualData->iStoredRenderBuffer;
delete iVisualData;
iOwner = NULL;