diff options
-rw-r--r-- | src/Window.hh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/Window.hh b/src/Window.hh index 27bb7dd..0abeb34 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.hh,v 1.43 2003/02/02 16:32:40 rathnor Exp $ | 25 | // $Id: Window.hh,v 1.44 2003/02/03 13:53:48 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef WINDOW_HH | 27 | #ifndef WINDOW_HH |
28 | #define WINDOW_HH | 28 | #define WINDOW_HH |
@@ -55,6 +55,7 @@ class BScreen; | |||
55 | namespace FbTk { | 55 | namespace FbTk { |
56 | class MenuTheme; | 56 | class MenuTheme; |
57 | class ImageControl; | 57 | class ImageControl; |
58 | class XLayer; | ||
58 | }; | 59 | }; |
59 | 60 | ||
60 | /// Creates the window frame and handles any window event for it | 61 | /// Creates the window frame and handles any window event for it |
@@ -96,8 +97,10 @@ public: | |||
96 | }; | 97 | }; |
97 | 98 | ||
98 | /// create fluxbox window with parent win and screen connection | 99 | /// create fluxbox window with parent win and screen connection |
99 | FluxboxWindow(Window win, BScreen *scr, int screen_num, FbTk::ImageControl &imgctrl, FbWinFrameTheme &tm, | 100 | FluxboxWindow(Window win, BScreen *scr, |
100 | FbTk::MenuTheme &menutheme); | 101 | int screen_num, FbTk::ImageControl &imgctrl, FbWinFrameTheme &tm, |
102 | FbTk::MenuTheme &menutheme, | ||
103 | FbTk::XLayer &layer); | ||
101 | virtual ~FluxboxWindow(); | 104 | virtual ~FluxboxWindow(); |
102 | 105 | ||
103 | 106 | ||
@@ -197,8 +200,8 @@ public: | |||
197 | const BScreen *getScreen() const { return screen; } | 200 | const BScreen *getScreen() const { return screen; } |
198 | BScreen *getScreen() { return screen; } | 201 | BScreen *getScreen() { return screen; } |
199 | 202 | ||
200 | const FbTk::XLayerItem *getLayerItem() const { return m_layeritem; } | 203 | const FbTk::XLayerItem &getLayerItem() const { return m_layeritem; } |
201 | FbTk::XLayerItem *getLayerItem() { return m_layeritem; } | 204 | FbTk::XLayerItem &getLayerItem() { return m_layeritem; } |
202 | 205 | ||
203 | const Tab *getTab() const { return tab; } | 206 | const Tab *getTab() const { return tab; } |
204 | Tab *getTab() { return tab; } | 207 | Tab *getTab() { return tab; } |
@@ -328,7 +331,9 @@ private: | |||
328 | 331 | ||
329 | Time lastButtonPressTime; | 332 | Time lastButtonPressTime; |
330 | FbTk::Menu m_windowmenu; | 333 | FbTk::Menu m_windowmenu; |
331 | FbTk::XLayerItem *m_layeritem; | 334 | |
335 | |||
336 | FbTk::XLayerItem m_layeritem; | ||
332 | int m_layernum; | 337 | int m_layernum; |
333 | 338 | ||
334 | timeval lastFocusTime; | 339 | timeval lastFocusTime; |