gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 22:28:02 +01:00
Code Issues Projects Releases Wiki Activity

- Fixed WMArray.

Browse Source 
- Changed WMList to use WMArray instead of WMBag
- Fixed compilation problems in WPrefs.app
This commit is contained in:
dan
2000-09-23 03:49:58 +00:00
parent 18b7dcc2b0
commit 41ff127444
8 changed files with 399 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
WPrefs.app/editmenu.c
View File

@@ -164,26 +164,29 @@ WCreateEditMenuItem(WMWidget *parent, char *title, Bool isTitle)
return iPtr;
}
char *WGetEditMenuItemTitle(WEditMenuItem *item)
char*
WGetEditMenuItemTitle(WEditMenuItem *item)
{
return item->label;
}
void *WGetEditMenuItemData(WEditMenuItem *item)
void*
WGetEditMenuItemData(WEditMenuItem *item)
{
return item->data;
}
void WSetEditMenuItemData(WEditMenuItem *item, void *data,
WMCallback *destroyer)
void
WSetEditMenuItemData(WEditMenuItem *item, void *data, WMCallback *destroyer)
{
item->data = data;
item->destroyData = destroyer;
}
void WSetEditMenuItemImage(WEditMenuItem *item, WMPixmap *pixmap)
void
WSetEditMenuItemImage(WEditMenuItem *item, WMPixmap *pixmap)
{
if (item->pixmap)
WMReleasePixmap(item->pixmap);
@@ -315,10 +318,9 @@ static void updateMenuContents(WEditMenu *mPtr);
static void handleEvents(XEvent *event, void *data);
static void editItemLabel(WEditMenuItem *item);
static void stopEditItem(WEditMenu *menu, Bool apply);
static void unmapMenu(WEditMenu *menu);
static void deselectItem(WEditMenu *menu);
@@ -594,12 +596,10 @@ WGetEditMenuSubmenu(WEditMenu *mPtr, WEditMenuItem *item)
}
static int simpleMatch(void *a, void *b)
static int
simpleMatch(void *a, void *b)
{
if (a == b)
return 1;
else
return 0;
return ((a == b) ? 1 : 0);
}
@@ -692,7 +692,7 @@ closeMenuAction(WMWidget *w, void *data)
WMAddIdleHandler(WMDestroyWidget, menu->closeB);
menu->closeB = NULL;
unmapMenu(menu);
WEditMenuHide(menu);
}
@@ -790,17 +790,32 @@ updateMenuContents(WEditMenu *mPtr)
}
static void
unmapMenu(WEditMenu *menu)
void
WEditMenuHide(WEditMenu *menu)
{
WMUnmapWidget(menu);
if (menu->selectedItem) {
deselectItem(menu);
}
}
void
WEditMenuUnhide(WEditMenu *menu)
{
WMMapWidget(menu);
}
void
WEditMenuShowAt(WEditMenu *menu, int x, int y)
{
WMMoveWidget(menu, x, y);
WMMapWidget(menu);
}
static void
deselectItem(WEditMenu *menu)
{
@@ -815,7 +830,7 @@ deselectItem(WEditMenu *menu)
submenu = item->submenu;
if (submenu && !WEditMenuIsTornOff(submenu)) {
unmapMenu(submenu);
WEditMenuHide(submenu);
}
menu->selectedItem = NULL;
@@ -1057,7 +1072,8 @@ slideWindow(Display *dpy, Window win, int srcX, int srcY, int dstX, int dstY)
}
static int errorHandler(Display *d, XErrorEvent *ev)
static int
errorHandler(Display *d, XErrorEvent *ev)
{
/* just ignore */
return 0;