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

[ion3.git] / ioncore / pholder.h

diff --git a/ioncore/pholder.h b/ioncore/pholder.h
index 4ccc65447c56947f1250d6c31f8f2f57ae4ae3b8..4d07f16be01b75fbf3aeb604048e1b8ffe4e2a8f 100644 (file)
--- a/ioncore/pholder.h
+++ b/ioncore/pholder.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_PHOLDER_H
@@ -24,7 +21,6 @@
 
 DECLCLASS(WPHolder){
     Obj obj;
-    WPHolder *redirect;
 };
 
 
@@ -45,11 +41,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);
 
@@ -59,8 +51,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);