Merge commit '20071220' into HEAD

[ion3.git] / ioncore / framedpholder.h

diff --git a/ioncore/framedpholder.h b/ioncore/framedpholder.h
index dfbbe5044c8b4f1e9c43b88bed1bb9509658ffa8..43032b7289afa426ce06d25abc23308b9f63ec55 100644 (file)
--- a/ioncore/framedpholder.h
+++ b/ioncore/framedpholder.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_FRAMEDPHOLDER_H
@@ -35,6 +32,7 @@ DECLCLASS(WFramedPHolder){
     WPHolder ph;
     WPHolder *cont;
     WFramedParam param;
+    Watch frame_watch;
 };
 
 
@@ -48,7 +46,7 @@ extern void framedpholder_deinit(WFramedPHolder *ph);
 
 extern bool framedpholder_do_goto(WFramedPHolder *ph);
 
-extern WPHolder *framedpholder_do_root(WFramedPHolder *ph);
+extern bool framedpholder_stale(WFramedPHolder *ph);
 
 extern WRegion *framedpholder_do_target(WFramedPHolder *ph);