new workspace window stacking

2 files changed, 11 insertions, 7 deletions

diff --git a/src/Tab.cc b/src/Tab.cc
index 57a6474..8752c14 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Tab.cc,v 1.31 2002/08/11 21:12:10 fluxgen Exp $
+// $Id: Tab.cc,v 1.32 2002/09/08 19:41:59 fluxgen Exp $
 
 #include "Tab.hh"
 
@@ -155,8 +155,11 @@ void Tab::raise() {
         //get first tab
         Tab *tab = 0;
         //raise tabs
-        for (tab = getFirst(this); tab!=0; tab = tab->m_next)
-                m_win->getScreen()->raiseWindows(&tab->m_tabwin, 1);
+        Workspace::Stack st;
+        for (tab = getFirst(this); tab!=0; tab = tab->m_next) {
+                st.push_back(tab->m_tabwin);
+        }
+        m_win->getScreen()->raiseWindows(st);
 }
 
 //-------------- lower --------------------
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 6856397..81bb0ff 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.30 2002/09/06 16:50:51 fluxgen Exp $
+// $Id: Toolbar.cc,v 1.31 2002/09/08 19:43:15 fluxgen Exp $
 
 #include "Toolbar.hh"
 
@@ -1022,8 +1022,9 @@ void Toolbar::buttonPressEvent(XButtonEvent *be) {
                 }
 #endif // HAVE_STRFTIME
                 else if (! on_top) {
-                        Window w[1] = { frame.window };
-                        screen->raiseWindows(w, 1);
+                        Workspace::Stack st;
+                        st.push_back(frame.window);
+                        screen->raiseWindows(st);
                 }
         } else if (be->button == 2 && (! on_top)) {
                 XLowerWindow(display, frame.window);
@@ -1315,7 +1316,7 @@ void Toolbarmenu::itemSelected(int button, unsigned int index) {
                         setItemSelected(1, change);
                         
                         if (toolbar->isOnTop())
-                                toolbar->screen->raiseWindows((Window *) 0, 0);
+                                toolbar->screen->raiseWindows(Workspace::Stack());
                         
                         Fluxbox::instance()->save_rc();
                         break;