aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 9c2126b..1884f07 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.77 2002/11/12 14:37:18 rathnor Exp $ 25// $Id: Screen.cc,v 1.78 2002/11/12 22:58:40 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -971,24 +971,24 @@ void BScreen::raiseWindows(const Workspace::Stack &workspace_stack) {
971 session_stack[i++] = configmenu->tabmenu().windowID(); 971 session_stack[i++] = configmenu->tabmenu().windowID();
972 session_stack[i++] = configmenu->windowID(); 972 session_stack[i++] = configmenu->windowID();
973 973
974 #ifdef SLIT 974#ifdef SLIT
975 session_stack[i++] = slit->menu().getDirectionmenu()->windowID(); 975 session_stack[i++] = slit->menu().getDirectionmenu()->windowID();
976 session_stack[i++] = slit->menu().getPlacementmenu()->windowID(); 976 session_stack[i++] = slit->menu().getPlacementmenu()->windowID();
977 #ifdef XINERAMA 977#ifdef XINERAMA
978 if (hasXinerama()) { 978 if (hasXinerama()) {
979 session_stack[i++] = slit->menu().getHeadmenu()->windowID(); 979 session_stack[i++] = slit->menu().getHeadmenu()->windowID();
980 } 980 }
981 #endif // XINERAMA 981#endif // XINERAMA
982 session_stack[i++] = slit->menu().windowID(); 982 session_stack[i++] = slit->menu().windowID();
983 #endif // SLIT 983#endif // SLIT
984 984
985 session_stack[i++] = 985 session_stack[i++] =
986 m_toolbar->getMenu()->getPlacementmenu()->windowID(); 986 m_toolbar->getMenu()->getPlacementmenu()->windowID();
987 #ifdef XINERAMA 987#ifdef XINERAMA
988 if (hasXinerama()) { 988 if (hasXinerama()) {
989 session_stack[i++] = m_toolbar->getMenu()->getHeadmenu()->windowID(); 989 session_stack[i++] = m_toolbar->getMenu()->getHeadmenu()->windowID();
990 } 990 }
991 #endif // XINERAMA 991#endif // XINERAMA
992 session_stack[i++] = m_toolbar->getMenu()->windowID(); 992 session_stack[i++] = m_toolbar->getMenu()->windowID();
993 993
994 Rootmenus::iterator rit = rootmenuList.begin(); 994 Rootmenus::iterator rit = rootmenuList.begin();
@@ -1001,10 +1001,10 @@ void BScreen::raiseWindows(const Workspace::Stack &workspace_stack) {
1001 if (m_toolbar->isOnTop()) 1001 if (m_toolbar->isOnTop())
1002 session_stack[i++] = m_toolbar->getWindowID(); 1002 session_stack[i++] = m_toolbar->getWindowID();
1003 1003
1004 #ifdef SLIT 1004#ifdef SLIT
1005 if (slit->isOnTop()) 1005 if (slit->isOnTop())
1006 session_stack[i++] = slit->getWindowID(); 1006 session_stack[i++] = slit->getWindowID();
1007 #endif // SLIT 1007#endif // SLIT
1008 if (!workspace_stack.empty()) { 1008 if (!workspace_stack.empty()) {
1009 Workspace::Stack::const_reverse_iterator it = workspace_stack.rbegin(); 1009 Workspace::Stack::const_reverse_iterator it = workspace_stack.rbegin();
1010 Workspace::Stack::const_reverse_iterator it_end = workspace_stack.rend(); 1010 Workspace::Stack::const_reverse_iterator it_end = workspace_stack.rend();