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/Window.hh | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-testing/argb.zip fluxbox_lack-testing/argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/Window.hh')
| -rw-r--r-- | src/Window.hh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Window.hh b/src/Window.hh index bf177b4..92d20d7 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
| @@ -243,8 +243,7 @@ public: | |||
| 243 | void raise(); | 243 | void raise(); |
| 244 | void lower(); | 244 | void lower(); |
| 245 | void tempRaise(); | 245 | void tempRaise(); |
| 246 | void raiseLayer(); | 246 | void changeLayer(int diff); |
| 247 | void lowerLayer(); | ||
| 248 | /// moves the window to a new layer | 247 | /// moves the window to a new layer |
| 249 | void moveToLayer(int layernum, bool force = false); | 248 | void moveToLayer(int layernum, bool force = false); |
| 250 | int getOnHead() const; | 249 | int getOnHead() const; |