X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.cc;h=322576c598d70270d135a53dea4a5107456b80f4;hb=5b8ec886237aff9ede99feb66721f8ac7a44d2ed;hp=e54ef19cfd7044e935579d591b7d0a6c01e4119a;hpb=01732a20dbb6b75431dc34fbe8401bfca952f43a;p=chaz%2Fopenbox diff --git a/src/Basemenu.cc b/src/Basemenu.cc index e54ef19c..322576c5 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.cc @@ -621,6 +621,7 @@ 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); @@ -637,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; @@ -660,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) { @@ -672,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); @@ -687,6 +692,7 @@ void Basemenu::drawItem(int index, bool highlight, bool clear, XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0); } else { +#endif // BITMAPBUTTONS const int bullet_size = 3; switch (screen->getMenuStyle()->bullet) { @@ -734,7 +740,9 @@ void Basemenu::drawItem(int index, bool highlight, bool clear, CoordModePrevious); break; } +#ifdef BITMAPBUTTONS } +#endif // BITMAPBUTTONS } }