summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/MenuTheme.hh22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index dd03910..7b1cca6 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -19,7 +19,7 @@
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: MenuTheme.hh,v 1.7 2003/07/19 03:59:56 rathnor Exp $ 22// $Id: MenuTheme.hh,v 1.8 2003/08/27 14:07:16 fluxgen Exp $
23 23
24#ifndef FBTK_MENUTHEME_HH 24#ifndef FBTK_MENUTHEME_HH
25#define FBTK_MENUTHEME_HH 25#define FBTK_MENUTHEME_HH
@@ -30,6 +30,8 @@
30#include "Texture.hh" 30#include "Texture.hh"
31#include "Text.hh" 31#include "Text.hh"
32#include "Subject.hh" 32#include "Subject.hh"
33#include "PixmapWithMask.hh"
34#include "GContext.hh"
33 35
34namespace FbTk { 36namespace FbTk {
35 37
@@ -58,6 +60,10 @@ public:
58 const FbTk::Texture &frameTexture() const { return *frame; } 60 const FbTk::Texture &frameTexture() const { return *frame; }
59 const FbTk::Texture &hiliteTexture() const { return *hilite; } 61 const FbTk::Texture &hiliteTexture() const { return *hilite; }
60 ///@} 62 ///@}
63
64 const FbTk::PixmapWithMask &bulletPixmap() const { return *m_bullet_pixmap; }
65 const FbTk::PixmapWithMask &selectedPixmap() const { return *m_selected_pixmap; }
66 const FbTk::PixmapWithMask &unselectedPixmap() const { return *m_unselected_pixmap; }
61 /** 67 /**
62 @name fonts 68 @name fonts
63 */ 69 */
@@ -75,11 +81,11 @@ public:
75 @name graphic contexts 81 @name graphic contexts
76 */ 82 */
77 ///@{ 83 ///@{
78 GC titleTextGC() const { return t_text_gc; } 84 GC titleTextGC() const { return t_text_gc.gc(); }
79 GC frameTextGC() const { return f_text_gc; } 85 GC frameTextGC() const { return f_text_gc.gc(); }
80 GC hiliteTextGC() const { return h_text_gc; } 86 GC hiliteTextGC() const { return h_text_gc.gc(); }
81 GC disableTextGC() const { return d_text_gc; } 87 GC disableTextGC() const { return d_text_gc.gc(); }
82 GC hiliteGC() const { return hilite_gc; } 88 GC hiliteGC() const { return hilite_gc.gc(); }
83 ///@} 89 ///@}
84 BulletType bullet() const { return *m_bullet; } 90 BulletType bullet() const { return *m_bullet; }
85 FbTk::Justify bulletPos() const { return *bullet_pos; } 91 FbTk::Justify bulletPos() const { return *bullet_pos; }
@@ -106,10 +112,10 @@ private:
106 FbTk::ThemeItem<unsigned int> m_border_width; 112 FbTk::ThemeItem<unsigned int> m_border_width;
107 FbTk::ThemeItem<unsigned int> m_bevel_width; 113 FbTk::ThemeItem<unsigned int> m_bevel_width;
108 FbTk::ThemeItem<FbTk::Color> m_border_color; 114 FbTk::ThemeItem<FbTk::Color> m_border_color;
109 115 FbTk::ThemeItem<FbTk::PixmapWithMask> m_bullet_pixmap, m_selected_pixmap, m_unselected_pixmap;
110 116
111 Display *m_display; 117 Display *m_display;
112 GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc; 118 FbTk::GContext t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
113 FbTk::Subject m_theme_change_sig; 119 FbTk::Subject m_theme_change_sig;
114 120
115 unsigned char m_alpha; 121 unsigned char m_alpha;