aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/XLayer.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc
index ad1e49d..023a80d 100644
--- a/src/FbTk/XLayer.cc
+++ b/src/FbTk/XLayer.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: XLayer.cc,v 1.7 2003/04/15 23:09:24 rathnor Exp $ 23// $Id: XLayer.cc,v 1.8 2003/04/15 23:20:31 rathnor Exp $
24 24
25#include "XLayer.hh" 25#include "XLayer.hh"
26#include "XLayerItem.hh" 26#include "XLayerItem.hh"
@@ -252,12 +252,12 @@ void XLayer::raise(XLayerItem &item) {
252 iterator it = std::find(itemList().begin(), itemList().end(), &item); 252 iterator it = std::find(itemList().begin(), itemList().end(), &item);
253 if (it != itemList().end()) 253 if (it != itemList().end())
254 itemList().erase(it); 254 itemList().erase(it);
255#ifdef DEBUG
256 else { 255 else {
256#ifdef DEBUG
257 cerr<<__FILE__<<"("<<__LINE__<<"): WARNING: raise on item not in layer["<<m_layernum<<"]"<<endl; 257 cerr<<__FILE__<<"("<<__LINE__<<"): WARNING: raise on item not in layer["<<m_layernum<<"]"<<endl;
258#endif // DEBUG
258 return; 259 return;
259 } 260 }
260#endif // DEBUG
261 261
262 itemList().push_front(&item); 262 itemList().push_front(&item);
263 stackBelowItem(&item, m_manager.getLowestItemAboveLayer(m_layernum)); 263 stackBelowItem(&item, m_manager.getLowestItemAboveLayer(m_layernum));
@@ -271,14 +271,12 @@ void XLayer::tempRaise(XLayerItem &item) {
271 return; // nothing to do 271 return; // nothing to do
272 272
273 iterator it = std::find(itemList().begin(), itemList().end(), &item); 273 iterator it = std::find(itemList().begin(), itemList().end(), &item);
274 if (it != itemList().end()) 274 if (it == itemList().end()) {
275 // don't remove it
276#ifdef DEBUG 275#ifdef DEBUG
277 else {
278 cerr<<__FILE__<<"("<<__LINE__<<"): WARNING: raise on item not in layer["<<m_layernum<<"]"<<endl; 276 cerr<<__FILE__<<"("<<__LINE__<<"): WARNING: raise on item not in layer["<<m_layernum<<"]"<<endl;
277#endif // DEBUG
279 return; 278 return;
280 } 279 }
281#endif // DEBUG
282 280
283 // don't add it back to the top 281 // don't add it back to the top
284 stackBelowItem(&item, m_manager.getLowestItemAboveLayer(m_layernum)); 282 stackBelowItem(&item, m_manager.getLowestItemAboveLayer(m_layernum));