Started renaming.

[ion3.git] / ioncore / mplexpholder.h

diff --git a/ioncore/mplexpholder.h b/ioncore/mplexpholder.h
index 4dce782953ffe319ad9d8a76916e2af675690be8..7528f6dfd14236886cd7682b592ae76ae75cabd0 100644 (file)
--- a/ioncore/mplexpholder.h
+++ b/ioncore/mplexpholder.h
@@ -1,12 +1,9 @@
 /*
  * 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
- * 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_MPLEXPHOLDER_H
@@ -16,18 +13,20 @@
 #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;
 };
 
 
-/* If 'after' is set, it is used, otherwise 'or_after', 
- * and finally 'or_layer' if this is also unset
+/* If 'either_st' is set, it is used, otherwise 'or_param', is used. 
  */
 
 extern WMPlexPHolder *create_mplexpholder(WMPlex *mplex, 
@@ -39,13 +38,13 @@ extern bool mplexpholder_init(WMPlexPHolder *ph,
                               WMPlexAttachParams *or_param);
 extern void mplexpholder_deinit(WMPlexPHolder *ph);
 
-extern int mplexpholder_layer(WMPlexPHolder *ph);
-
 extern WRegion *mplexpholder_do_attach(WMPlexPHolder *ph, int flags,
                                        WRegionAttachData *data);
 
 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,