Rearranged the structure of the WINGs subdirectory.

Created Documentation, Examples and Tests subdirectories.

Run update-autoconf after this update.

WINGs/Documentation/.cvsignore

@@ -0,0 +1,3 @@
+Makefile Makefile.in
+.psrc .inslog2 tca.map tca.log
+*.rpt

WINGs/Documentation/Makefile.am

@@ -0,0 +1,6 @@
+## automake input file for WINGs - Documentation
+
+AUTOMAKE_OPTIONS = no-dependencies
+
+EXTRA_DIST = wm.png wm.html
+

WINGs/Examples/.cvsignore

@@ -0,0 +1,3 @@
+Makefile Makefile.in
+.psrc .inslog2 tca.map tca.log
+*.rpt

WINGs/Examples/Makefile.am

@@ -0,0 +1,27 @@
+## automake input file for WINGs - Examples
+
+AUTOMAKE_OPTIONS = no-dependencies
+
+
+noinst_PROGRAMS = connect fontl puzzle
+
+
+LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+	 @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
+	-lm @LIBPL@
+
+
+fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+
+puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+
+connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+
+connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
+	@NETLIBS@ @LIBPL@
+
+
+INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+
+

WINGs/Makefile.am

@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = no-dependencies
 
-SUBDIRS = Resources
+SUBDIRS = . Documentation Resources Examples Tests
 
 
 
@@ -12,9 +12,6 @@ include_HEADERS = WINGs.h WUtil.h WINGsP.h
 
 bin_SCRIPTS = get-wings-flags get-wutil-flags
 
-noinst_PROGRAMS = wtest wmquery wmfile fontl testmywidget testcolorpanel\
-	connect puzzle testtext
-
 lib_LIBRARIES = libWINGs.a libWUtil.a
 
 
@@ -23,16 +20,7 @@ LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la\
 	-lm @LIBPL@
 
 
-testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
+EXTRA_DIST = BUGS
-
-wtest_DEPENDENCIES = libWINGs.a
-
-testtext_DEPENDENCIES = libWINGs.a
-
-connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
-
-
-EXTRA_DIST = logo.xpm BUGS wm.png upbtn.xpm wm.html
 
 # wbutton.c 
 libWINGs_a_SOURCES = 	\

WINGs/Tests/.cvsignore

@@ -0,0 +1,3 @@
+Makefile Makefile.in
+.psrc .inslog2 tca.map tca.log
+*.rpt

WINGs/Tests/Makefile.am

@@ -0,0 +1,24 @@
+## automake input file for WINGs - Tests
+
+AUTOMAKE_OPTIONS = no-dependencies
+
+noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel testtext
+
+LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+	@LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
+	-lm @LIBPL@
+
+
+testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
+
+wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+
+testtext_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+
+
+EXTRA_DIST = logo.xpm upbtn.xpm
+
+INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+
+

WINGs/WUtil.h

@@ -352,7 +352,7 @@ extern const WMHashTableCallbacks WMStringPointerHashCallbacks;
  * 
  * Cons:
  * A little slower [O(n)] for insertion/deletion of elements that 
- * 	arent in the end
+ * 	aren't in the end
  * Element indexes with large difference will cause large holes
  */
 #if 0

WINGs/bagarray.c

@@ -20,27 +20,27 @@ typedef struct W_ArrayBag {
 } W_ArrayBag;
 
 
-static int    getItemCount(WMBag *bag);
+static int   getItemCount(WMBag *bag);
 static int   appendBag(WMBag *bag, WMBag *appendedBag);
 static int   putInBag(WMBag *bag, void *item);
 static int   insertInBag(WMBag *bag, int index, void *item);
 static int   removeFromBag(WMBag *bag, void *item);
 static int   deleteFromBag(WMBag *bag, int index);
-static void*  getFromBag(WMBag *bag, int index);
+static void* getFromBag(WMBag *bag, int index);
-static int    firstInBag(WMBag *bag, void *item);
+static int   firstInBag(WMBag *bag, void *item);
-static int    countInBag(WMBag *bag, void *item);
+static int   countInBag(WMBag *bag, void *item);
-static void*  replaceInBag(WMBag *bag, int index, void *item);
+static void* replaceInBag(WMBag *bag, int index, void *item);
 static int   sortBag(WMBag *bag, int (*comparer)(const void*, const void*));
-static void   emptyBag(WMBag *bag);
+static void  emptyBag(WMBag *bag);
-static void   freeBag(WMBag *bag);
+static void  freeBag(WMBag *bag);
-static void mapBag(WMBag *bag, void (*function)(void*, void*), void *data);
+static void  mapBag(WMBag *bag, void (*function)(void*, void*), void *data);
-static int    findInBag(WMBag *bag, int (*match)(void*));
+static int   findInBag(WMBag *bag, int (*match)(void*));
-static void*  first(WMBag *bag, void **ptr);
+static void* first(WMBag *bag, void **ptr);
-static void*  last(WMBag *bag, void **ptr);
+static void* last(WMBag *bag, void **ptr);
-static void*  next(WMBag *bag, void **ptr);
+static void* next(WMBag *bag, void **ptr);
-static void*  previous(WMBag *bag, void **ptr);
+static void* previous(WMBag *bag, void **ptr);
-static void*  iteratorAtIndex(WMBag *bag, int index, WMBagIterator *ptr);
+static void* iteratorAtIndex(WMBag *bag, int index, WMBagIterator *ptr);
-static int    indexForIterator(WMBag *bag, WMBagIterator ptr);
+static int   indexForIterator(WMBag *bag, WMBagIterator ptr);
 
 
 static W_BagFunctions arrayFunctions = {
@@ -69,7 +69,7 @@ static W_BagFunctions arrayFunctions = {
 };
 
 
-#define ARRAY ((W_ArrayBag*)bag->data)
+#define ARRAY ((W_ArrayBag*)(bag->data))
 
 
 #define I2O(a, i) ((a)->base + i)
@@ -235,7 +235,6 @@ getFromBag(WMBag *bag, int index)
 }
 
 
-
 static int
 firstInBag(WMBag *bag, void *item)
 {

WPrefs.app/Makefile.am

@@ -39,6 +39,7 @@ WPrefs_SOURCES = \
 	editmenu.c \
 	editmenu.h \
 	imagebrowser.c \
+	imagebrowser.h \
 	xmodifier.c
 
 CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"

configure.in

@@ -850,12 +850,13 @@ dnl AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ,$PATH)
 dnl AC_SUBST(DOCTYPES)
 
 AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile wmlib/Makefile \
-	WINGs/Makefile WINGs/Resources/Makefile src/Makefile src/wconfig.h \
+	WINGs/Makefile WINGs/Documentation/Makefile WINGs/Examples/Makefile \
-	wrlib/Makefile doc/Makefile WindowMaker/Makefile contrib/Makefile \
+	WINGs/Resources/Makefile WINGs/Tests/Makefile wrlib/Makefile \
-	WindowMaker/Backgrounds/Makefile WindowMaker/Defaults/Makefile \
+	src/Makefile src/wconfig.h doc/Makefile contrib/Makefile \
-	WindowMaker/IconSets/Makefile WindowMaker/Icons/Makefile \
+	WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \
-	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
+	WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \
-	WindowMaker/Themes/Makefile \
+	WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
+	WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
 	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
 	WPrefs.app/po/Makefile contrib/WindowMaker.spec )