diff options
Diffstat (limited to 'src/Theme.hh')
-rw-r--r-- | src/Theme.hh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/Theme.hh b/src/Theme.hh index 5cafbf6..7e2e6f0 100644 --- a/src/Theme.hh +++ b/src/Theme.hh | |||
@@ -42,19 +42,14 @@ | |||
42 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 42 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
43 | // DEALINGS IN THE SOFTWARE. | 43 | // DEALINGS IN THE SOFTWARE. |
44 | 44 | ||
45 | // $Id: Theme.hh,v 1.6 2002/02/17 18:49:50 fluxgen Exp $ | 45 | // $Id: Theme.hh,v 1.7 2002/03/21 10:54:29 fluxgen Exp $ |
46 | 46 | ||
47 | #ifndef THEME_HH | 47 | #ifndef THEME_HH |
48 | #define THEME_HH | 48 | #define THEME_HH |
49 | 49 | ||
50 | |||
51 | #ifndef _IMAGE_HH_ | ||
52 | #include "Image.hh" | 50 | #include "Image.hh" |
53 | #endif //!_IMAGE_HH_ | ||
54 | |||
55 | #ifndef _DRAWUTIL_HH_ | ||
56 | #include "DrawUtil.hh" | 51 | #include "DrawUtil.hh" |
57 | #endif //!_MISC_HH_ | 52 | #include "Font.hh" |
58 | 53 | ||
59 | #include <X11/Xlib.h> | 54 | #include <X11/Xlib.h> |
60 | #include <X11/Xresource.h> | 55 | #include <X11/Xresource.h> |
@@ -74,7 +69,9 @@ public: | |||
74 | BColor t_text, f_text, h_text, d_text; | 69 | BColor t_text, f_text, h_text, d_text; |
75 | BTexture title, frame, hilite; | 70 | BTexture title, frame, hilite; |
76 | GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc; | 71 | GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc; |
77 | DrawUtil::Font titlefont, framefont; | 72 | FbTk::Font *titlefont, *framefont; |
73 | DrawUtil::Font::FontJustify framefont_justify; | ||
74 | DrawUtil::Font::FontJustify titlefont_justify; | ||
78 | int bullet, bullet_pos; | 75 | int bullet, bullet_pos; |
79 | } MenuStyle; | 76 | } MenuStyle; |
80 | 77 | ||