4 files changed, 20 insertions, 6 deletions

diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 9ab69b4..fba7ae2 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.hh,v 1.21 2003/07/20 10:41:56 rathnor Exp $
+// $Id: Menu.hh,v 1.22 2003/07/20 18:05:39 rathnor Exp $
 
 #ifndef  FBTK_MENU_HH
 #define  FBTK_MENU_HH
@@ -37,7 +37,6 @@
 #include "RefCount.hh"
 #include "Command.hh"
 #include "Observer.hh"
-#include "XLayerItem.hh"
 #include "FbPixmap.hh"
 #include "MenuTheme.hh"
 
diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc
index fea4dae..9e3272b 100644
--- a/src/FbTk/MultLayers.cc
+++ b/src/FbTk/MultLayers.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MultLayers.cc,v 1.6 2003/02/18 15:08:12 rathnor Exp $
+// $Id: MultLayers.cc,v 1.7 2003/07/20 18:05:39 rathnor Exp $
 
 #include "MultLayers.hh"
 #include "XLayer.hh"
@@ -32,7 +32,9 @@ using namespace std;
 
 using namespace FbTk;
 
-MultLayers::MultLayers(int numlayers) {
+MultLayers::MultLayers(int numlayers) :
+    m_lock(0) 
+{
     for (int i=0; i < numlayers; ++i) 
         m_layers.push_back(new XLayer(*this, i));
 }
@@ -150,6 +152,8 @@ void MultLayers::moveToLayer(XLayerItem &item, int layernum) {
 }
 
 void MultLayers::restack() {
+    if (!isUpdatable()) 
+        return;
 
     int layernum=0, winnum=0, size = this->size();
 
diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh
index 5cfc731..29c80a8 100644
--- a/src/FbTk/MultLayers.hh
+++ b/src/FbTk/MultLayers.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MultLayers.hh,v 1.5 2003/02/09 14:11:14 rathnor Exp $
+// $Id: MultLayers.hh,v 1.6 2003/07/20 18:05:40 rathnor Exp $
 
 #ifndef FBTK_MULTLAYERS_HH
 #define FBTK_MULTLAYERS_HH
@@ -59,9 +59,15 @@ public:
     XLayer *getLayer(size_t num);
     const XLayer *getLayer(size_t num) const;
 
+    inline bool isUpdatable() const { return m_lock == 0; }
+    inline void lock() { ++m_lock; }
+    inline void unlock() { if (--m_lock == 0) restack(); }
+
 private:
     std::vector<XLayer *> m_layers;
 
+    int m_lock;
+
 };
 
 };
diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc
index 023a80d..8164444 100644
--- a/src/FbTk/XLayer.cc
+++ b/src/FbTk/XLayer.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XLayer.cc,v 1.8 2003/04/15 23:20:31 rathnor Exp $
+// $Id: XLayer.cc,v 1.9 2003/07/20 18:05:40 rathnor Exp $
 
 #include "XLayer.hh"
 #include "XLayerItem.hh"
@@ -39,6 +39,9 @@ XLayer::~XLayer() {
 }
 
 void XLayer::restack() {
+    if (!m_manager.isUpdatable())
+        return;
+
     int num_windows = countWindows();
 
     // each LayerItem can contain several windows
@@ -78,6 +81,8 @@ int XLayer::countWindows() {
 
 // Stack all windows associated with 'item' below the 'above' item
 void XLayer::stackBelowItem(XLayerItem *item, XLayerItem *above) {
+    if (!m_manager.isUpdatable())
+        return;
 
     Window *winlist;
     size_t winnum, size, num = item->numWindows();