7 files changed, 19 insertions, 5 deletions

diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index aada7cf..6fe6b83 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -399,9 +399,6 @@ void Ewmh::updateClientList(BScreen &screen) {
     for (; client_it != client_it_end; ++client_it)
         wl[win++] = (*client_it)->window();
 
-    //number of windows to show in client list
-    num = win;
-
     /*  From Extended Window Manager Hints, draft 1.3:
      *
      * _NET_CLIENT_LIST, WINDOW[]/32
diff --git a/src/FbTk/Layer.hh b/src/FbTk/Layer.hh
index bbb3037..4fc2c8b 100644
--- a/src/FbTk/Layer.hh
+++ b/src/FbTk/Layer.hh
@@ -41,18 +41,22 @@ public:
     virtual iterator insert(ItemType &item, unsigned int pos=0);
     /// remove item from list
     virtual void remove(ItemType &item);
+#ifdef NOT_USED
     /// cycle all item upwards
     virtual void cycleUp();
     /// cycle all items downwards
     virtual void cycleDown();
+#endif // NOT_USED
     /// move item to top
     virtual void raise(ItemType &item);
     /// move item to bottom
     virtual void lower(ItemType &item);
+#ifdef NOT_USED
     /// raise a specific item one step
     virtual void stepUp(ItemType &item);
     /// lower a specific item one step
     virtual void stepDown(ItemType &item);
+#endif // NOT_USED
     virtual void restack();
     /// @return layer item on specific position, on failure 0
     ItemType *getItem(unsigned int position);
@@ -93,6 +97,7 @@ void Layer<ItemType, Container>::remove(ItemType &item) {
         m_list.erase(it);
 }
 
+#ifdef NOT_USED
 template <typename ItemType, typename Container>
 void Layer<ItemType, Container>::cycleUp() {
     if (size() == 0)
@@ -157,6 +162,8 @@ void Layer<ItemType, Container>::stepDown(ItemType &item) {
     itemList().insert(new_pos, textitem);
     restack();
 }
+#endif // NOT_USED
+
 template <typename ItemType, typename Container>
 void Layer<ItemType, Container>::raise(ItemType &item) {
     if (&item == itemList().front()) // already at the bottom
diff --git a/src/FbTk/LayerItem.hh b/src/FbTk/LayerItem.hh
index b6f4df9..14eac40 100644
--- a/src/FbTk/LayerItem.hh
+++ b/src/FbTk/LayerItem.hh
@@ -34,8 +34,11 @@ public:
 
     virtual void raise() = 0;
     virtual void lower() = 0;
+
+#ifdef NOT_USED
     virtual void stepUp() = 0;
     virtual void stepDown() = 0;
+#endif // NOT_USED
 };
 
 } // end namespace FbTk
diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc
index f7eda8c..0341563 100644
--- a/src/FbTk/XLayer.cc
+++ b/src/FbTk/XLayer.cc
@@ -190,6 +190,7 @@ void XLayer::remove(XLayerItem &item) {
     }
 }
 
+#ifdef NOT_USED
 void XLayer::cycleUp() {
     // need to find highest visible window, and move it to bottom
     iterator it = itemList().begin();
@@ -265,8 +266,7 @@ void XLayer::stepDown(XLayerItem &item) {
         return; // nothing to do
 
     // get our position
-    iterator myit = find(itemList().begin(), itemList().end(), &item);
-    iterator it = myit;
+    iterator it = find(itemList().begin(), itemList().end(), &item);
 
     // go one below it (top is front, so we must increment)
     it++;
@@ -282,6 +282,7 @@ void XLayer::stepDown(XLayerItem &item) {
         stackBelowItem(&item, *it);
     // if we did reach the end, then there are no visible windows, so we don't do anything
 }
+#endif // NOT_USED
 
 void XLayer::raise(XLayerItem &item) {
     // assume it is already in this layer
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh
index bed93cc..660886e 100644
--- a/src/FbTk/XLayer.hh
+++ b/src/FbTk/XLayer.hh
@@ -63,12 +63,14 @@ public:
     iterator insert(XLayerItem &item, unsigned int pos=0);
     void remove(XLayerItem &item);
 
+#ifdef NOT_USED
     // move highest to bottom
     void cycleUp();
     void cycleDown();
     // just go above the next window up in the current layer (not all the way to the top)
     void stepUp(XLayerItem &item);
     void stepDown(XLayerItem &item);
+#endif // NOT_USED
 
     // bring to top of layer
     void raise(XLayerItem &item);
diff --git a/src/FbTk/XLayerItem.cc b/src/FbTk/XLayerItem.cc
index ff554ad..bb6cea1 100644
--- a/src/FbTk/XLayerItem.cc
+++ b/src/FbTk/XLayerItem.cc
@@ -60,6 +60,7 @@ void XLayerItem::tempRaise() {
     m_layer->tempRaise(*this); 
 }
 
+#ifdef NOT_USED
 void XLayerItem::stepUp() {
     m_layer->stepUp(*this);
 }
@@ -67,6 +68,7 @@ void XLayerItem::stepUp() {
 void XLayerItem::stepDown() {
     m_layer->stepDown(*this);
 }
+#endif // NOT_USED
 
 void XLayerItem::raiseLayer() {
     m_layer->raiseLayer(*this); 
diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh
index 3d778bb..90d2167 100644
--- a/src/FbTk/XLayerItem.hh
+++ b/src/FbTk/XLayerItem.hh
@@ -48,9 +48,11 @@ public:
     void lower();
     void tempRaise(); // this raise gets reverted by a restack()
 
+#ifdef NOT_USED
     // go above the next item visible in this layer
     void stepUp();
     void stepDown();
+#endif // NOT_USED
 
     // send to next layer up
     void raiseLayer();