- Fixed WMArray.

- Changed WMList to use WMArray instead of WMBag
- Fixed compilation problems in WPrefs.app

WPrefs.app/Menu.c

@@ -1303,14 +1303,13 @@ menuItemCloned(WEditMenuDelegate *delegate, WEditMenu *menu,
 }
 
 
-
-
-static void menuItemEdited(struct WEditMenuDelegate *delegate, WEditMenu *menu,
-			   WEditMenuItem *item)
+static void
+menuItemEdited(struct WEditMenuDelegate *delegate, WEditMenu *menu,
+               WEditMenuItem *item)
 {
     _Panel *panel = (_Panel*)delegate->data;
     WEditMenu *submenu;
-    
+
     updateFrameTitle(panel, WGetEditMenuItemTitle(item), panel->currentType);
 
     submenu = WGetEditMenuSubmenu(menu, item);
@@ -1320,17 +1319,15 @@ static void menuItemEdited(struct WEditMenuDelegate *delegate, WEditMenu *menu,
 }
 
 
-
-
-
-static Bool shouldRemoveItem(struct WEditMenuDelegate *delegate,
-			     WEditMenu *menu, WEditMenuItem *item)
+static Bool
+shouldRemoveItem(struct WEditMenuDelegate *delegate, WEditMenu *menu,
+                 WEditMenuItem *item)
 {
     _Panel *panel = (_Panel*)delegate->data;
 
     if (panel->dontAsk)
 	return True;
-    
+
     if (WGetEditMenuSubmenu(menu, item)) {
 	int res;
 	

WPrefs.app/editmenu.c

@@ -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;

WPrefs.app/editmenu.h

@@ -21,6 +21,9 @@
  */
 
 
+#ifndef _editmenu_h_
+#define _editmenu_h_
+
 typedef struct W_EditMenu WEditMenu;
 typedef struct W_EditMenuItem WEditMenuItem;
 
@@ -98,3 +101,13 @@ WMPoint WGetEditMenuLocationForSubmenu(WEditMenu *mPtr, WEditMenu *submenu);
 void WTearOffEditMenu(WEditMenu *menu, WEditMenu *submenu);
 
 Bool WEditMenuIsTornOff(WEditMenu *mPtr);
+
+void WEditMenuHide(WEditMenu *menu);
+
+void WEditMenuUnhide(WEditMenu *menu);
+
+void WEdirMenuShowAt(WEditMenu *menu, int x, int y);
+
+
+#endif
+