[svn-upgrade] Integrating new upstream version, ion3 (20071220)

[ion3.git] / ioncore / grouppholder.h

diff --git a/ioncore/grouppholder.h b/ioncore/grouppholder.h
index 86974ad3b39a4b4c32e600dfeb3d51e71ffa3c76..c8295370b9b2f718a4f6027e29d1963cacc3d4e6 100644 (file)
--- a/ioncore/grouppholder.h
+++ b/ioncore/grouppholder.h
@@ -13,13 +13,14 @@
 #include <ioncore/pholder.h>
 #include "group.h"
 
-INTRCLASS(WGroupPHolder);
 
 DECLCLASS(WGroupPHolder){
     WPHolder ph;
-    Watch group_watch;
+    WGroup *group;
     Watch stack_above_watch;
     WGroupAttachParams param;
+    WGroupPHolder *next, *prev;
+    WPHolder *recreate_pholder;
 };
 
 extern WGroupPHolder *create_grouppholder(WGroup *group, 
@@ -43,4 +44,8 @@ extern WRegion *grouppholder_do_attach(WGroupPHolder *ph, int flags,
 extern WGroupPHolder *group_managed_get_pholder(WGroup *group, 
                                                 WRegion *mgd);
 
+extern void grouppholder_do_unlink(WGroupPHolder *ph);
+extern void grouppholder_do_link(WGroupPHolder *ph, WGroup *group, 
+                                 WRegion *stack_above);
+
 #endif /* ION_IONCORE_GROUPPHOLDER_H */