merged with 2_1-merged-to-HEAD-2002-09-30

[chaz/openbox] / src / Basemenu.cc

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 4cddaa97d09b403d6f08da561d742393cbeadbb8..322576c598d70270d135a53dea4a5107456b80f4 100644 (file)
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -621,13 +621,13 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   }
 
   if (dooppsel && item->isSelected()) {
+#ifdef    BITMAPBUTTONS
     if ( style->tick_image.mask != None) {
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
                      oppsel_x, item_y + menu.item_h/2 - style->tick_image.h/2);
       XSetClipMask(blackbox->getXDisplay(), pen.gc(),
                    style->tick_image.mask);
 
-      cout << oppsel_x << ' ' << sel_x << endl;
       XFillRectangle(blackbox->getXDisplay(), menu.frame, pen.gc(),
                      oppsel_x, item_y + menu.item_h/2 - style->tick_image.h/2,
                      style->tick_image.w,
@@ -638,6 +638,7 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
                      0, 0);
     } else {
+#endif // BITMAPBUTTONS
       XPoint pts[6];
 
       pts[0].x = oppsel_x + 0;
@@ -661,7 +662,9 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
 
       XFillPolygon(display, menu.frame, pen.gc(), pts, 6, Nonconvex,
                    CoordModePrevious);
+#ifdef    BITMAPBUTTONS
     }
+#endif // BITMAPBUTTONS
   }
 
   if (dotext && text) {
@@ -673,6 +676,7 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   }
 
   if (dosel && item->submenu()) {
+#ifdef    BITMAPBUTTONS
     if ( style->bullet_image.mask != None) {
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
                      sel_x, item_y + menu.item_h/2 - style->bullet_image.h/2);
@@ -681,14 +685,14 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
 
       XFillRectangle(blackbox->getXDisplay(), menu.frame, pen.gc(),
                      sel_x, item_y + menu.item_h/2 - style->bullet_image.h/2,
-                     sel_x + style->bullet_image.w,
-                     item_y + menu.item_h/2 + style->bullet_image.h/2);
+                     style->bullet_image.w, style->bullet_image.h);
 
       XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
       
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
                      0, 0);
     } else {
+#endif // BITMAPBUTTONS
       const int bullet_size = 3;
 
       switch (screen->getMenuStyle()->bullet) {
@@ -736,7 +740,9 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
                      CoordModePrevious);
         break;
       }
+#ifdef    BITMAPBUTTONS
     }
+#endif // BITMAPBUTTONS
   }
 }