Dont hardcode button layout in XfeCreateLoadedToolBar. Update Makefile for

XfeWidgets.mk.

cmd/xfe/XfeWidgets/XfeTest/Makefile

@@ -31,15 +31,6 @@ MODULE			= XfeTest/Xfe
 
 LIBRARY_NAME	= XfeTest
 
-
-ifdef XFE_WIDGETS_BUILD_DEMO
-XFE_EXTRA_DEFINES += -DXFE_WIDGETS_BUILD_DEMO
-endif
-
-ifdef XFE_WIDGETS_BUILD_UNUSED
-XFE_EXTRA_DEFINES += -DXFE_WIDGETS_BUILD_UNUSED
-endif
-
 CSRCS			= \
 				TestAnim.c \
 				TestApp.c \
@@ -62,5 +53,6 @@ EXPORTS			= \
 
 include $(DEPTH)/config/rules.mk
 
+include $(DEPTH)/cmd/xfe/XfeWidgets/XfeWidgets.mk
+
 INCLUDES	+= -I../icons
-DEFINES		+= $(XFE_EXTRA_DEFINES)

cmd/xfe/XfeWidgets/XfeTest/TestCreate.c

@@ -113,14 +113,17 @@ XfeLoadToolBar(Widget			tool_bar,
 			XtAddCallback(tool_items[i],XmNactivateCallback,activate_cb,NULL);
 		}
 
-		if ((i % sep_offset) == 0)
-		{
-			Widget sep = XmCreateSeparator(tool_bar,
-										   (orientation == XmVERTICAL) ? 
-										   "vsep" : "hsep",
-										   NULL,0);
-			
-			XtManageChild(sep);
+        if (sep_count > 0)
+        {
+          if ((i % sep_offset) == 0)
+          {
+			  Widget sep = XmCreateSeparator(tool_bar,
+											 (orientation == XmVERTICAL) ? 
+											 "vsep" : "hsep",
+											 NULL,0);
+			  
+			  XtManageChild(sep);
+		  }
 		}
     }
 
@@ -154,7 +157,7 @@ XfeCreateLoadedToolBar(Widget			pw,
 		xfeToolBarWidgetClass,
 		pw,
 		XmNbackground,		XfeBackground(pw),
-		XmNbuttonLayout,	XmBUTTON_LABEL_ON_BOTTOM,
+/* 		XmNbuttonLayout,	XmBUTTON_LABEL_ON_BOTTOM, */
 		NULL);
 
 	if (tool_count > 0)