diff options
Diffstat (limited to 'src/IconBar.hh')
-rw-r--r-- | src/IconBar.hh | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/IconBar.hh b/src/IconBar.hh index d0202a3..428fbf0 100644 --- a/src/IconBar.hh +++ b/src/IconBar.hh | |||
@@ -19,29 +19,36 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: IconBar.hh,v 1.6 2002/02/17 18:57:47 fluxgen Exp $ | 22 | // $Id: IconBar.hh,v 1.7 2002/08/04 15:55:13 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef ICONBAR_HH | 24 | #ifndef ICONBAR_HH |
25 | #define ICONBAR_HH | 25 | #define ICONBAR_HH |
26 | 26 | ||
27 | #include <vector> | ||
28 | #include "Window.hh" | 27 | #include "Window.hh" |
29 | 28 | ||
30 | #include <list> | 29 | #include <list> |
31 | 30 | ||
31 | /** | ||
32 | Icon object in IconBar | ||
33 | */ | ||
32 | class IconBarObj | 34 | class IconBarObj |
33 | { | 35 | { |
34 | public: | 36 | public: |
35 | IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin); | 37 | IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin); |
36 | ~IconBarObj(); | 38 | ~IconBarObj(); |
37 | inline Window getIconWin(void) { return m_iconwin; } | 39 | Window getIconWin() const { return m_iconwin; } |
38 | inline FluxboxWindow *getFluxboxWin(void) { return m_fluxboxwin; } | 40 | FluxboxWindow *getFluxboxWin() { return m_fluxboxwin; } |
39 | unsigned int getWidth(void); | 41 | const FluxboxWindow *getFluxboxWin() const { return m_fluxboxwin; } |
42 | unsigned int width() const; | ||
43 | |||
40 | private: | 44 | private: |
41 | FluxboxWindow *m_fluxboxwin; | 45 | FluxboxWindow *m_fluxboxwin; |
42 | Window m_iconwin; | 46 | Window m_iconwin; |
43 | }; | 47 | }; |
44 | 48 | ||
49 | /** | ||
50 | Icon container | ||
51 | */ | ||
45 | class IconBar | 52 | class IconBar |
46 | { | 53 | { |
47 | public: | 54 | public: |
@@ -64,7 +71,7 @@ private: | |||
64 | void loadTheme(unsigned int width, unsigned int height); | 71 | void loadTheme(unsigned int width, unsigned int height); |
65 | void decorate(Window win); | 72 | void decorate(Window win); |
66 | // IconBarObj *findIcon(FluxboxWindow *fluxboxwin); | 73 | // IconBarObj *findIcon(FluxboxWindow *fluxboxwin); |
67 | void repositionIcons(void); | 74 | void repositionIcons(); |
68 | Window createIconWindow(FluxboxWindow *fluxboxwin, Window parent); | 75 | Window createIconWindow(FluxboxWindow *fluxboxwin, Window parent); |
69 | BScreen *m_screen; | 76 | BScreen *m_screen; |
70 | Display *m_display; | 77 | Display *m_display; |
@@ -74,4 +81,4 @@ private: | |||
74 | unsigned long m_focus_pixel; | 81 | unsigned long m_focus_pixel; |
75 | }; | 82 | }; |
76 | 83 | ||
77 | #endif // _ICONBAR_HH_ | 84 | #endif // ICONBAR_HH |