aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-19 21:18:29 (GMT)
committerfluxgen <fluxgen>2002-07-19 21:18:29 (GMT)
commitabe8ed2968de9ace1acca70d82da8559a6f633e3 (patch)
tree4cb77586d9f7039f9dea563f314e88f936e1c3b9
parent650924679ac4aad6b28b88196d2831d428ee22d0 (diff)
downloadfluxbox-abe8ed2968de9ace1acca70d82da8559a6f633e3.zip
fluxbox-abe8ed2968de9ace1acca70d82da8559a6f633e3.tar.bz2
updated BColor function names
-rw-r--r--src/Basemenu.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 94c9da5..0bf729c 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Basemenu.cc,v 1.25 2002/05/29 21:15:07 fluxgen Exp $ 25// $Id: Basemenu.cc,v 1.26 2002/07/19 21:18:29 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -124,8 +124,8 @@ m_alignment(ALIGNDONTCARE) {
124 XSetWindowAttributes attrib; 124 XSetWindowAttributes attrib;
125 attrib.background_pixmap = None; 125 attrib.background_pixmap = None;
126 attrib.background_pixel = attrib.border_pixel = 126 attrib.background_pixel = attrib.border_pixel =
127 m_screen->getBorderColor()->getPixel(); 127 m_screen->getBorderColor()->pixel();
128 attrib.colormap = m_screen->getColormap(); 128 attrib.colormap = m_screen->colormap();
129 attrib.override_redirect = True; 129 attrib.override_redirect = True;
130 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | 130 attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
131 ButtonMotionMask | ExposureMask; 131 ButtonMotionMask | ExposureMask;
@@ -140,7 +140,7 @@ m_alignment(ALIGNDONTCARE) {
140 140
141 //attibutes for title to menuwindow 141 //attibutes for title to menuwindow
142 attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel | CWEventMask; 142 attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel | CWEventMask;
143 attrib.background_pixel = m_screen->getBorderColor()->getPixel(); 143 attrib.background_pixel = m_screen->getBorderColor()->pixel();
144 attrib.event_mask |= EnterWindowMask | LeaveWindowMask; 144 attrib.event_mask |= EnterWindowMask | LeaveWindowMask;
145 //create menu title 145 //create menu title
146 menu.title = 146 menu.title =
@@ -351,7 +351,7 @@ void Basemenu::update(void) {
351 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 351 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
352 menu.title_pixmap = None; 352 menu.title_pixmap = None;
353 XSetWindowBackground(m_display, menu.title, 353 XSetWindowBackground(m_display, menu.title,
354 texture->getColor()->getPixel()); 354 texture->color().pixel());
355 } else { 355 } else {
356 menu.title_pixmap = 356 menu.title_pixmap =
357 m_image_ctrl->renderImage(menu.width, menu.title_h, texture); 357 m_image_ctrl->renderImage(menu.width, menu.title_h, texture);
@@ -366,7 +366,7 @@ void Basemenu::update(void) {
366 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 366 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
367 menu.frame_pixmap = None; 367 menu.frame_pixmap = None;
368 XSetWindowBackground(m_display, menu.frame, 368 XSetWindowBackground(m_display, menu.frame,
369 texture->getColor()->getPixel()); 369 texture->color().pixel());
370 } else { 370 } else {
371 menu.frame_pixmap = 371 menu.frame_pixmap =
372 m_image_ctrl->renderImage(menu.width, menu.frame_h, texture); 372 m_image_ctrl->renderImage(menu.width, menu.frame_h, texture);
@@ -1120,9 +1120,9 @@ void Basemenu::leaveNotifyEvent(XCrossingEvent *ce) {
1120 1120
1121void Basemenu::reconfigure(void) { 1121void Basemenu::reconfigure(void) {
1122 XSetWindowBackground(m_display, menu.window, 1122 XSetWindowBackground(m_display, menu.window,
1123 m_screen->getBorderColor()->getPixel()); 1123 m_screen->getBorderColor()->pixel());
1124 XSetWindowBorder(m_display, menu.window, 1124 XSetWindowBorder(m_display, menu.window,
1125 m_screen->getBorderColor()->getPixel()); 1125 m_screen->getBorderColor()->pixel());
1126 XSetWindowBorderWidth(m_display, menu.window, m_screen->getBorderWidth()); 1126 XSetWindowBorderWidth(m_display, menu.window, m_screen->getBorderWidth());
1127 1127
1128 menu.bevel_w = m_screen->getBevelWidth(); 1128 menu.bevel_w = m_screen->getBevelWidth();