diff options
author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
---|---|---|
committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/XLayer.hh | |
parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/XLayer.hh')
-rw-r--r-- | src/FbTk/XLayer.hh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh index ae29310..ba5406b 100644 --- a/src/FbTk/XLayer.hh +++ b/src/FbTk/XLayer.hh | |||
@@ -31,7 +31,7 @@ namespace FbTk { | |||
31 | class MultLayers; | 31 | class MultLayers; |
32 | class XLayerItem; | 32 | class XLayerItem; |
33 | 33 | ||
34 | class XLayer : public FbTk::Layer<XLayerItem, std::list<XLayerItem *> > { | 34 | class XLayer : public FbTk::LayerBase<XLayerItem, std::list<XLayerItem *> > { |
35 | public: | 35 | public: |
36 | 36 | ||
37 | XLayer(MultLayers &manager, int layernum); | 37 | XLayer(MultLayers &manager, int layernum); |
@@ -49,9 +49,6 @@ public: | |||
49 | int countWindows(); | 49 | int countWindows(); |
50 | void stackBelowItem(XLayerItem &item, XLayerItem *above); | 50 | void stackBelowItem(XLayerItem &item, XLayerItem *above); |
51 | XLayerItem *getLowestItem(); | 51 | XLayerItem *getLowestItem(); |
52 | XLayerItem *getItemBelow(XLayerItem &item); | ||
53 | XLayerItem *getItemAbove(XLayerItem &item); | ||
54 | |||
55 | const ItemList &getItemList() const { return itemList(); } | 52 | const ItemList &getItemList() const { return itemList(); } |
56 | ItemList &getItemList() { return itemList(); } | 53 | ItemList &getItemList() { return itemList(); } |
57 | 54 | ||