Imported Upstream version 20090110

[ion3.git] / ioncore / pholder.h

diff --git a/ioncore/pholder.h b/ioncore/pholder.h
index b2b4986a1e365d75dca1ff7642c3dec75f73a5bd..12e90fae7ea3897d947a38668ceb6060ba8c2605 100644 (file)
--- a/ioncore/pholder.h
+++ b/ioncore/pholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/pholder.h
  *
- * Copyright (c) Tuomo Valkonen 2005-2007. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -15,13 +15,13 @@
 
 
 #define PHOLDER_ATTACH_SWITCHTO 0x0001
+#define PHOLDER_ATTACH_RETURN_CREATEROOT 0x0002
 
 
 /* Note: PHolders should be destroyed by their acquirer. */
 
 DECLCLASS(WPHolder){
     Obj obj;
-    WPHolder *redirect;
 };
 
 
@@ -42,11 +42,7 @@ DYNFUN WRegion *pholder_do_target(WPHolder *ph);
 
 extern WRegion *pholder_target(WPHolder *ph);
 
-extern WPHolder *pholder_do_root(WPHolder *ph);
-
-extern WPHolder *pholder_root(WPHolder *ph);
-
-extern bool pholder_stale(WPHolder *ph);
+DYNFUN bool pholder_stale(WPHolder *ph);
 
 DYNFUN bool pholder_do_check_reparent(WPHolder *ph, WRegion *reg);
 
@@ -56,8 +52,6 @@ DYNFUN bool pholder_do_goto(WPHolder *ph);
 
 extern bool pholder_goto(WPHolder *ph);
 
-extern bool pholder_redirect(WPHolder *ph, WRegion *old_target);
-
 extern WPHolder *pholder_either(WPHolder *a, WPHolder *b);
 
 DYNFUN WPHolder *region_managed_get_pholder(WRegion *reg, WRegion *mgd);