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

[ion3.git] / ioncore / mplexpholder.h

diff --git a/ioncore/mplexpholder.h b/ioncore/mplexpholder.h
index 4dce782953ffe319ad9d8a76916e2af675690be8..5a9892232beb69083f9af39a40294a63e97bb892 100644 (file)
--- a/ioncore/mplexpholder.h
+++ b/ioncore/mplexpholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/mplexpholder.h
  *
- * Copyright (c) Tuomo Valkonen 2005-2006. 
+ * 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
@@ -16,10 +16,13 @@
 #include "pholder.h"
 #include "mplex.h"
 #include "attach.h"
+#include "framedpholder.h"
+
 
 DECLCLASS(WMPlexPHolder){
     WPHolder ph;
     Watch mplex_watch;
+    WFramedPHolder *recreate_pholder; /* only on first of list */
     WLListNode *after;
     WMPlexPHolder *next, *prev;
     WMPlexAttachParams param;
@@ -46,6 +49,8 @@ extern WRegion *mplexpholder_do_attach(WMPlexPHolder *ph, int flags,
 
 extern bool mplexpholder_do_goto(WMPlexPHolder *ph);
 
+extern WPHolder *mplexpholder_do_root(WMPlexPHolder *ph);
+
 extern WRegion *mplexpholder_do_target(WMPlexPHolder *ph);
 
 extern bool mplexpholder_move(WMPlexPHolder *ph, WMPlex *mplex,