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

[ion3.git] / ioncore / grouppholder.h

diff --git a/ioncore/grouppholder.h b/ioncore/grouppholder.h
index cb0ab198df23867d701b1aee17d88c10f9a07f51..c8295370b9b2f718a4f6027e29d1963cacc3d4e6 100644 (file)
--- a/ioncore/grouppholder.h
+++ b/ioncore/grouppholder.h
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 2005-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #ifndef ION_IONCORE_GROUPPHOLDER_H
@@ -16,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, 
@@ -46,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 */