aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Theme.hh')
-rw-r--r--src/Theme.hh12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Theme.hh b/src/Theme.hh
index e02b8af..7b973d1 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -50,8 +50,8 @@
50#include "Image.hh" 50#include "Image.hh"
51#endif //_IMAGE_HH_ 51#endif //_IMAGE_HH_
52 52
53#ifndef _MISC_HH_ 53#ifndef _DRAWUTIL_HH_
54#include "misc.hh" 54#include "DrawUtil.hh"
55#endif //_MISC_HH_ 55#endif //_MISC_HH_
56 56
57#include <X11/Xlib.h> 57#include <X11/Xlib.h>
@@ -70,7 +70,7 @@ public:
70 BColor t_text, f_text, h_text, d_text; 70 BColor t_text, f_text, h_text, d_text;
71 BTexture title, frame, hilite; 71 BTexture title, frame, hilite;
72 GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc; 72 GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
73 Misc::Font titlefont, framefont; 73 DrawUtil::Font titlefont, framefont;
74 int bullet, bullet_pos; 74 int bullet, bullet_pos;
75 } MenuStyle; 75 } MenuStyle;
76 76
@@ -79,7 +79,7 @@ public:
79 BTexture l_focus, l_unfocus, 79 BTexture l_focus, l_unfocus,
80 t_focus, t_unfocus; 80 t_focus, t_unfocus;
81 GC l_text_focus_gc, l_text_unfocus_gc; 81 GC l_text_focus_gc, l_text_unfocus_gc;
82 Misc::Font font; 82 DrawUtil::Font font;
83 BColor l_text_focus, l_text_unfocus; 83 BColor l_text_focus, l_text_unfocus;
84 } LabelStyle; 84 } LabelStyle;
85 85
@@ -95,7 +95,7 @@ public:
95 BColor border_color; 95 BColor border_color;
96 unsigned int border_width; 96 unsigned int border_width;
97 unsigned int border_width_2x; 97 unsigned int border_width_2x;
98 Misc::XRotFontStruct *rot_font; 98 DrawUtil::XRotFontStruct *rot_font;
99 } tab; 99 } tab;
100 100
101 } WindowStyle; 101 } WindowStyle;
@@ -105,7 +105,7 @@ public:
105 BColor l_text, w_text, c_text, b_pic; 105 BColor l_text, w_text, c_text, b_pic;
106 BTexture toolbar, label, window, button, pressed, clock; 106 BTexture toolbar, label, window, button, pressed, clock;
107 GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc; 107 GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc;
108 Misc::Font font; 108 DrawUtil::Font font;
109 109
110 } ToolbarStyle; 110 } ToolbarStyle;
111 111