From c4bedc7c2907a07b20f23bb26db7b2ca0b038d69 Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Sat, 29 Dec 2001 10:40:51 +0000 Subject: Updated texture constant and changed the include guard --- src/Screen.cc | 12 ++++++------ src/Screen.hh | 13 +++---------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/Screen.cc b/src/Screen.cc index bcada25..160c379 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -244,9 +244,9 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) { InputOutput, getVisual(), mask, &attrib); geom_visible = False; - if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) { + if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) { if (theme->getWindowStyle().t_focus.getTexture() == - (BImage_Flat | BImage_Solid)) { + (BImage::FLAT | BImage::SOLID)) { geom_pixmap = None; XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, theme->getWindowStyle().t_focus.getColor()->getPixel()); @@ -258,7 +258,7 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) { } } else { if (theme->getWindowStyle().l_focus.getTexture() == - (BImage_Flat | BImage_Solid)) { + (BImage::FLAT | BImage::SOLID)) { geom_pixmap = None; XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, theme->getWindowStyle().l_focus.getColor()->getPixel()); @@ -458,9 +458,9 @@ void BScreen::reconfigure(void) { geom_h += getBevelWidth()*2; Pixmap tmp = geom_pixmap; - if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) { + if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) { if (theme->getWindowStyle().t_focus.getTexture() == - (BImage_Flat | BImage_Solid)) { + (BImage::FLAT | BImage::SOLID)) { geom_pixmap = None; XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, theme->getWindowStyle().t_focus.getColor()->getPixel()); @@ -472,7 +472,7 @@ void BScreen::reconfigure(void) { } } else { if (theme->getWindowStyle().l_focus.getTexture() == - (BImage_Flat | BImage_Solid)) { + (BImage::FLAT | BImage::SOLID)) { geom_pixmap = None; XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, theme->getWindowStyle().l_focus.getColor()->getPixel()); diff --git a/src/Screen.hh b/src/Screen.hh index 9c2b5af..91a824f 100644 --- a/src/Screen.hh +++ b/src/Screen.hh @@ -24,8 +24,8 @@ -#ifndef __Screen_hh -#define __Screen_hh +#ifndef _SCREEN_HH_ +#define _SCREEN_HH_ #include <X11/Xlib.h> #include <X11/Xresource.h> @@ -302,15 +302,10 @@ private: LinkedList<Workspace> *workspacesList; struct resource { -// WindowStyle wstyle; -// ToolbarStyle tstyle; -// MenuStyle mstyle; Bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise, auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max, focus_new, focus_last, tab_rotate_vertical, semi_sloppy_focus; -// BColor border_color; -// XrmDatabase stylerc; int workspaces, toolbar_placement, toolbar_width_percent, placement_policy, edge_snap_threshold, row_direction, col_direction; @@ -322,8 +317,6 @@ private: int slit_placement, slit_direction; #endif // SLIT - // unsigned int handle_width, frame_width, - // border_width, border_width_2x; #ifdef HAVE_STRFTIME char *strftime_format; @@ -352,4 +345,4 @@ protected: }; -#endif // __Screen_hh +#endif // _SCREEN_HH_ -- cgit v0.11.2