gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-14 21:15:50 +01:00
Code Issues Projects Releases Wiki Activity

bag tree finished.. updated code to new bags

Browse Source
This commit is contained in:
kojima
2000-03-29 02:17:39 +00:00
parent 8219011758
commit 9e45e85dc6
16 changed files with 691 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
WINGs/wpopupbutton.c
View File

@@ -307,7 +307,7 @@ WMGetPopUpButtonItem(WMPopUpButton *bPtr, int index)
return NULL;
item = WMGetFromBag(bPtr->items, index);
if (!item)
if (item == NULL)
return NULL;
return WMGetMenuItemTitle(item);
@@ -464,8 +464,9 @@ makeMenuPixmap(PopUpButton *bPtr)
{
Pixmap pixmap;
W_Screen *scr = bPtr->view->screen;
int i;
int yo;
WMMenuItem *item;
WMBagIterator iter;
int yo, i;
int width, height, itemHeight;
itemHeight = bPtr->view->size.height;
@@ -479,12 +480,11 @@ makeMenuPixmap(PopUpButton *bPtr)
XFillRectangle(scr->display, pixmap, WMColorGC(scr->gray), 0, 0,
width, height);
for (i = 0; i < WMGetBagItemCount(bPtr->items); i++) {
i = 0;
WM_ITERATE_BAG(bPtr->items, item, iter) {
GC gc;
WMMenuItem *item;
char *text;
item = (WMMenuItem*)WMGetFromBag(bPtr->items, i);
text = WMGetMenuItemTitle(item);
W_DrawRelief(scr, pixmap, 0, i*itemHeight, width, itemHeight,
@@ -506,6 +506,8 @@ makeMenuPixmap(PopUpButton *bPtr)
width-scr->popUpIndicator->width-4,
i*itemHeight+(itemHeight-scr->popUpIndicator->height)/2);
}
i++;
}
return pixmap;
@@ -758,14 +760,13 @@ static void
destroyPopUpButton(PopUpButton *bPtr)
{
WMMenuItem *item;
int i;
WMBagIterator i;
if (bPtr->timer) {
WMDeleteTimerHandler(bPtr->timer);
}
for (i = 0; i < WMGetBagItemCount(bPtr->items); i++) {
item = WMGetFromBag(bPtr->items, i);
WM_ITERATE_BAG(bPtr->items, item, i) {
WMDestroyMenuItem(item);
}
WMFreeBag(bPtr->items);