# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286145934 -10800
# Node ID 718701e1595f1b00dc77a12ff66b997a552efb4d
# Parent  93c3782a0a3b3b178b011fa335dc84deea9e2472
Revision: 201037
Kit: 201039

diff -r 93c3782a0a3b -r 718701e1595f layers.sysdef.xml
--- a/layers.sysdef.xml	Fri Sep 17 08:35:19 2010 +0300
+++ b/layers.sysdef.xml	Mon Oct 04 01:45:34 2010 +0300
@@ -12,10 +12,14 @@
     </layer>
 
     
+  <!-- disable - not supported
    <layer name="unit_test_layer">
       <module name="uiaccelerator_test">
         <unit unitID="nga.uiaccererator.unittest" mrp="" bldFile="&layer_real_source_path;/tsrc/group" name="uiaccelerator_test" />
       </module>
     </layer>
+  -->
+
   </systemModel>
+  
 </SystemDefinition>
\ No newline at end of file
diff -r 93c3782a0a3b -r 718701e1595f uiacceltk/hitchcock/ServerCore/Inc/alfnodes.h
--- a/uiacceltk/hitchcock/ServerCore/Inc/alfnodes.h	Fri Sep 17 08:35:19 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Inc/alfnodes.h	Mon Oct 04 01:45:34 2010 +0300
@@ -228,6 +228,11 @@
     void Debug_CheckSiblingOrder(const TDesC16& aContext);
     #endif
     
+    /**
+     * Oprhans aNode and all its siblings.
+     */
+    static void OrphanAll(CAlfNode* aNode);
+    
 public: // Data    
     
     CAlfNode* iParent;
diff -r 93c3782a0a3b -r 718701e1595f uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp
--- a/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp	Fri Sep 17 08:35:19 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp	Mon Oct 04 01:45:34 2010 +0300
@@ -1070,7 +1070,7 @@
         // SetLayerUsesAplhaFlag is not supported for image visual
         node->Window()->SetLayerUsesAplhaFlag( enabled );
 #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS        
-        node->Window()->SetTransparencyAlphaChannel( enabled );
+        node->FlagChanged(MWsWindowTreeObserver::EAlphaChannelTransparencyEnabled, enabled);
 #endif // #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS        
         }
     else if( node ) // this would mean that node has being orphaneded but not yet deleted
diff -r 93c3782a0a3b -r 718701e1595f uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp
--- a/uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp	Fri Sep 17 08:35:19 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp	Mon Oct 04 01:45:34 2010 +0300
@@ -1246,12 +1246,18 @@
         }
     
     // Orphan all the children
-    CAlfNode* child = iChild; 
-    while( child )
-        {
-        child = child->OrphanMe();
-        }
+    OrphanAll(iChild);
     iChild = NULL;
+    
+    OrphanAll(iAnimChild);
+    iAnimChild = NULL;
+    
+    OrphanAll(iSpriteChild);
+    iSpriteChild = NULL;
+    
+    OrphanAll(iTextCursor);
+    iTextCursor = NULL;
+    
     if ( iModel )
         {    
         iModel->RemoveNode( iId );
@@ -1353,6 +1359,18 @@
     }
 
 // ---------------------------------------------------------------------------
+// OrphanAll
+// ---------------------------------------------------------------------------
+//
+void CAlfNode::OrphanAll(CAlfNode* aNode)
+    {
+    while (aNode)
+        {
+        aNode = aNode->OrphanMe();
+        }
+    }
+
+// ---------------------------------------------------------------------------
 // CommitCommandsL
 // ---------------------------------------------------------------------------
 //
diff -r 93c3782a0a3b -r 718701e1595f uiacceltk/hitchcock/goommonitor/src/goomlog.cpp
--- a/uiacceltk/hitchcock/goommonitor/src/goomlog.cpp	Fri Sep 17 08:35:19 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/src/goomlog.cpp	Mon Oct 04 01:45:34 2010 +0300
@@ -18,6 +18,7 @@
 
 #ifdef _DEBUG
 
+#include <e32hal.h>
 #include <hal.h>
 #include <w32std.h>
 #include <e32std.h>