aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/MenuTheme.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2007-12-29 21:38:53 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2007-12-29 21:38:53 (GMT)
commite1f362ae764884a4cd1e1673292cb37d5a85f89c (patch)
tree137430b26aee6f3638f27281d3757c2c75ef4b20 /src/FbTk/MenuTheme.hh
parente90c3678d9e54bc9251619fdee2d7341f042167b (diff)
downloadfluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip
fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/FbTk/MenuTheme.hh')
-rw-r--r--src/FbTk/MenuTheme.hh112
1 files changed, 56 insertions, 56 deletions
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index d76c2fb..1e82b6d 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -1,6 +1,6 @@
1// MenuTheme.hh for FbTk 1// MenuTheme.hh for FbTk
2// Copyright (c) 2002 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org) 2// Copyright (c) 2002 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation 6// to deal in the Software without restriction, including without limitation
@@ -55,90 +55,90 @@ public:
55 @name text colors 55 @name text colors
56 */ 56 */
57 ///@{ 57 ///@{
58 inline const Color &titleTextColor() const { return *t_text; } 58 const Color &titleTextColor() const { return *t_text; }
59 inline const Color &frameTextColor() const { return *f_text; } 59 const Color &frameTextColor() const { return *f_text; }
60 inline const Color &frameUnderlineColor() const { return *u_text; } 60 const Color &frameUnderlineColor() const { return *u_text; }
61 inline const Color &highlightTextColor() const { return *h_text; } 61 const Color &highlightTextColor() const { return *h_text; }
62 inline const Color &disableTextColor() const { return *d_text; } 62 const Color &disableTextColor() const { return *d_text; }
63 ///@} 63 ///@}
64 /** 64 /**
65 @name textures 65 @name textures
66 */ 66 */
67 ///@{ 67 ///@{
68 inline const Texture &titleTexture() const { return *title; } 68 const Texture &titleTexture() const { return *title; }
69 inline const Texture &frameTexture() const { return *frame; } 69 const Texture &frameTexture() const { return *frame; }
70 inline const Texture &hiliteTexture() const { return *hilite; } 70 const Texture &hiliteTexture() const { return *hilite; }
71 ///@} 71 ///@}
72 72
73 inline const PixmapWithMask &bulletPixmap() const { return *m_bullet_pixmap; } 73 const PixmapWithMask &bulletPixmap() const { return *m_bullet_pixmap; }
74 inline const PixmapWithMask &selectedPixmap() const { return *m_selected_pixmap; } 74 const PixmapWithMask &selectedPixmap() const { return *m_selected_pixmap; }
75 inline const PixmapWithMask &unselectedPixmap() const { return *m_unselected_pixmap; } 75 const PixmapWithMask &unselectedPixmap() const { return *m_unselected_pixmap; }
76 76
77 inline const PixmapWithMask &highlightBulletPixmap() const { return *m_hl_bullet_pixmap; } 77 const PixmapWithMask &highlightBulletPixmap() const { return *m_hl_bullet_pixmap; }
78 inline const PixmapWithMask &highlightSelectedPixmap() const { return *m_hl_selected_pixmap; } 78 const PixmapWithMask &highlightSelectedPixmap() const { return *m_hl_selected_pixmap; }
79 inline const PixmapWithMask &highlightUnselectedPixmap() const { return *m_hl_unselected_pixmap; } 79 const PixmapWithMask &highlightUnselectedPixmap() const { return *m_hl_unselected_pixmap; }
80 /** 80 /**
81 @name fonts 81 @name fonts
82 */ 82 */
83 ///@{ 83 ///@{
84 inline const Font &titleFont() const { return *titlefont; } 84 const Font &titleFont() const { return *titlefont; }
85 inline Font &titleFont() { return *titlefont; } 85 Font &titleFont() { return *titlefont; }
86 inline const Font &frameFont() const { return *framefont; } 86 const Font &frameFont() const { return *framefont; }
87 inline Font &frameFont() { return *framefont; } 87 Font &frameFont() { return *framefont; }
88 ///@} 88 ///@}
89 89
90 inline Justify frameFontJustify() const { return *framefont_justify; } 90 Justify frameFontJustify() const { return *framefont_justify; }
91 inline Justify titleFontJustify() const { return *titlefont_justify; } 91 Justify titleFontJustify() const { return *titlefont_justify; }
92 92
93 /** 93 /**
94 @name graphic contexts 94 @name graphic contexts
95 */ 95 */
96 ///@{ 96 ///@{
97 inline const GContext &titleTextGC() const { return t_text_gc; } 97 const GContext &titleTextGC() const { return t_text_gc; }
98 inline const GContext &frameTextGC() const { return f_text_gc; } 98 const GContext &frameTextGC() const { return f_text_gc; }
99 inline const GContext &frameUnderlineGC() const { return u_text_gc; } 99 const GContext &frameUnderlineGC() const { return u_text_gc; }
100 inline const GContext &hiliteTextGC() const { return h_text_gc; } 100 const GContext &hiliteTextGC() const { return h_text_gc; }
101 inline const GContext &disableTextGC() const { return d_text_gc; } 101 const GContext &disableTextGC() const { return d_text_gc; }
102 inline const GContext &hiliteGC() const { return hilite_gc; } 102 const GContext &hiliteGC() const { return hilite_gc; }
103 inline GContext &titleTextGC() { return t_text_gc; } 103 GContext &titleTextGC() { return t_text_gc; }
104 inline GContext &frameTextGC() { return f_text_gc; } 104 GContext &frameTextGC() { return f_text_gc; }
105 inline GContext &frameUnderlineGC() { return u_text_gc; } 105 GContext &frameUnderlineGC() { return u_text_gc; }
106 inline GContext &hiliteTextGC() { return h_text_gc; } 106 GContext &hiliteTextGC() { return h_text_gc; }
107 inline GContext &disableTextGC() { return d_text_gc; } 107 GContext &disableTextGC() { return d_text_gc; }
108 inline GContext &hiliteGC() { return hilite_gc; } 108 GContext &hiliteGC() { return hilite_gc; }
109 ///@} 109 ///@}
110 inline BulletType bullet() const { return *m_bullet; } 110 BulletType bullet() const { return *m_bullet; }
111 inline Justify bulletPos() const { return *bullet_pos; } 111 Justify bulletPos() const { return *bullet_pos; }
112 112
113 inline unsigned int titleHeight() const { return m_real_title_height; } 113 unsigned int titleHeight() const { return m_real_title_height; }
114 inline unsigned int itemHeight() const { return m_real_item_height; } 114 unsigned int itemHeight() const { return m_real_item_height; }
115 inline unsigned int borderWidth() const { return *m_border_width; } 115 unsigned int borderWidth() const { return *m_border_width; }
116 inline unsigned int bevelWidth() const { return *m_bevel_width; } 116 unsigned int bevelWidth() const { return *m_bevel_width; }
117 117
118 inline unsigned char alpha() const { return m_alpha; } 118 unsigned char alpha() const { return m_alpha; }
119 inline void setAlpha(unsigned char alpha) { m_alpha = alpha; } 119 void setAlpha(unsigned char alpha) { m_alpha = alpha; }
120 // this isn't actually a theme item 120 // this isn't actually a theme item
121 // but we'll let it be here for now, until there's a better way to 121 // but we'll let it be here for now, until there's a better way to
122 // get resources into menu 122 // get resources into menu
123 inline void setMenuMode(MenuMode mode) { m_menumode = mode; } 123 void setMenuMode(MenuMode mode) { m_menumode = mode; }
124 inline MenuMode menuMode() const { return m_menumode; } 124 MenuMode menuMode() const { return m_menumode; }
125 inline void setDelayOpen(int msec) { m_delayopen = msec; } 125 void setDelayOpen(int msec) { m_delayopen = msec; }
126 inline void setDelayClose(int msec) { m_delayclose = msec; } 126 void setDelayClose(int msec) { m_delayclose = msec; }
127 inline int delayOpen() const { return m_delayopen; } 127 int delayOpen() const { return m_delayopen; }
128 inline int delayClose() const { return m_delayclose; } 128 int delayClose() const { return m_delayclose; }
129 129
130 inline const Color &borderColor() const { return *m_border_color; } 130 const Color &borderColor() const { return *m_border_color; }
131 inline Shape::ShapePlace shapePlaces() const { return *m_shapeplace; } 131 Shape::ShapePlace shapePlaces() const { return *m_shapeplace; }
132 132
133 // special override 133 // special override
134 inline void setSelectedPixmap(Pixmap pm, bool is_imagecached) { 134 void setSelectedPixmap(Pixmap pm, bool is_imagecached) {
135 m_selected_pixmap->pixmap() = pm; 135 m_selected_pixmap->pixmap() = pm;
136 if (is_imagecached) 136 if (is_imagecached)
137 m_selected_pixmap->pixmap().dontFree(); 137 m_selected_pixmap->pixmap().dontFree();
138 } 138 }
139 139
140 inline void setHighlightSelectedPixmap(Pixmap pm, bool is_imagecached) { 140 void setHighlightSelectedPixmap(Pixmap pm, bool is_imagecached) {
141 m_hl_selected_pixmap->pixmap() = pm; 141 m_hl_selected_pixmap->pixmap() = pm;
142 if (is_imagecached) 142 if (is_imagecached)
143 m_hl_selected_pixmap->pixmap().dontFree(); 143 m_hl_selected_pixmap->pixmap().dontFree();
144 } 144 }
@@ -148,7 +148,7 @@ private:
148 ThemeItem<Texture> title, frame, hilite; 148 ThemeItem<Texture> title, frame, hilite;
149 ThemeItem<Font> titlefont, framefont; 149 ThemeItem<Font> titlefont, framefont;
150 ThemeItem<Justify> framefont_justify, titlefont_justify; 150 ThemeItem<Justify> framefont_justify, titlefont_justify;
151 ThemeItem<Justify> bullet_pos; 151 ThemeItem<Justify> bullet_pos;
152 ThemeItem<BulletType> m_bullet; 152 ThemeItem<BulletType> m_bullet;
153 ThemeItem<Shape::ShapePlace> m_shapeplace; 153 ThemeItem<Shape::ShapePlace> m_shapeplace;
154 ThemeItem<unsigned int> m_title_height, m_item_height; 154 ThemeItem<unsigned int> m_title_height, m_item_height;