Move the bookmark widgets to their own library. Componetize things a bit.

Should make it easier to completely bypass these widgets if needed - as
will probably be the case for lite browsers and "motifs" that break cause
of them.


git-svn-id: svn://10.0.0.236/trunk@1181 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/cmd/xfe/Makefile

@@ -73,9 +73,10 @@ DIRS		= \
 		  Microline3.0/XmL \
 		  $(NULL)
 
-REQUIRES	= \
-		XfeWidgets \
-		Microline \
+REQUIRES	=\
+			XfeWidgets \
+			XfeBm \
+			Microline \
 		  addr \
 		  applet \
 		  img \
@@ -195,8 +196,9 @@ GARBAGE		+= e_kit_resources.h cxxlink-filter
 
 ICONS_LIB	= $(DIST)/lib/lib$(LITE_PREFIX)xfeicons.a
 
-DTWIDGETS_LIB	= $(DIST)/lib/libDtWidgets.a
-XFE_WIDGETS_LIB	= $(DIST)/lib/libXfeWidgets.a
+DTWIDGETS_LIB		= $(DIST)/lib/libDtWidgets.a
+XFE_WIDGETS_LIB		= $(DIST)/lib/libXfeWidgets.a
+XFE_WIDGETS_BM_LIB	= $(DIST)/lib/libXfeBm.a
 
 ifeq ($(OS_ARCH),AIX)
 NSPR_LIB	= 
@@ -224,6 +226,7 @@ BASIC_LIBS	= \
 		  $(MICROLINE_LIB) \
 		  $(ICONS_LIB) \
 		  $(DTWIDGETS_LIB) \
+		  $(XFE_WIDGETS_BM_LIB) \
 		  $(XFE_WIDGETS_LIB) \
 		  $(DIST)/lib/libxlate.a \
 		  $(DIST)/lib/lib$(LITE_PREFIX)net.a \
@@ -792,6 +795,9 @@ $(DTWIDGETS_LIB):
 $(XFE_WIDGETS_LIB):
 	cd XfeWidgets/Xfe; $(MAKE)
 
+$(XFE_WIDGETS_BM_LIB):
+	cd XfeWidgets/XfeBm; $(MAKE)
+
 $(XFE2_LIB):
 	cd src; $(MAKE)
 

mozilla/cmd/xfe/XfeWidgets/Makefile

@@ -35,6 +35,7 @@ endif
 
 DIRS			= \
 				Xfe \
+				XfeBm \
 				$(TEST_DIRS)
 
 include $(DEPTH)/config/rules.mk

mozilla/cmd/xfe/XfeWidgets/Xfe/Makefile

@@ -78,8 +78,6 @@ CSRCS			= \
 				$(DEMO_CSRCS) \
 				$(UNUSED_CSRCS) \
 				Arrow.c \
-				BmButton.c \
-				BmCascade.c \
 				Button.c \
 				BypassShell.c \
 				CallProcs.c \
@@ -129,10 +127,6 @@ EXPORTS			= \
 				$(UNUSED_EXPORTS) \
 				Arrow.h \
 				ArrowP.h \
-				BmButton.h \
-				BmButtonP.h \
-				BmCascade.h \
-				BmCascadeP.h \
 				Button.h \
 				ButtonP.h \
 				BypassShell.h \

mozilla/cmd/xfe/XfeWidgets/Xfe/XfeAll.h

@@ -28,8 +28,6 @@
 #define _XfeAll_h_
 
 #include <Xfe/Arrow.h>
-#include <Xfe/BmButton.h>
-#include <Xfe/BmCascade.h>
 #include <Xfe/Button.h>
 #include <Xfe/Cascade.h>
 #include <Xfe/Chrome.h>

mozilla/cmd/xfe/XfeWidgets/XfeBm/Makefile

@@ -0,0 +1,50 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+##########################################################################
+#
+# Name:			Makefile
+# Description:	Makefile for XfeBm library.
+# Author:		Ramiro Estrugo <ramiro@netscape.com>
+#
+##########################################################################
+
+DEPTH			= ../../../..
+
+# XfeWidgets headers are exported to dist/public/XfeWidgets/Xfe
+MODULE			= XfeWidgets/Xfe
+
+LIBRARY_NAME	= XfeBm
+
+CSRCS			= \
+				BmButton.c \
+				BmCascade.c \
+				$(NULL)
+
+REQUIRES		=\
+				XfeWidgets \
+				XfeBm
+
+EXPORTS			= \
+				BmButton.h \
+				BmButtonP.h \
+				BmCascade.h \
+				BmCascadeP.h \
+				$(NULL)
+
+include $(DEPTH)/config/rules.mk

mozilla/cmd/xfe/XfeWidgets/XfeTest/Makefile

@@ -45,7 +45,8 @@ CSRCS			= \
 
 REQUIRES		= \
 				XfeTest \
-				XfeWidgets
+				XfeWidgets \
+				XfeBm
 
 EXPORTS			= \
 				XfeTest.h \

mozilla/cmd/xfe/XfeWidgets/XfeTest/XfeTest.h

@@ -33,6 +33,8 @@
 #include <unistd.h>
 
 #include <Xfe/XfeAll.h>
+#include <Xfe/BmButton.h>
+#include <Xfe/BmCascade.h>
 
 #include <Xm/XmAll.h>
 

mozilla/cmd/xfe/XfeWidgets/XfeWidgets.mk

@@ -58,6 +58,13 @@ XFE_STATIC_TEST_LIB		= $(DIST)/lib/libXfeTest.a
 XFE_SHARED_TEST_LIB		= $(DIST)/bin/libXfeTest.$(DLL_SUFFIX)
 XFE_TEST_REQUIRES		= XfeTest
 
+##
+## Xfe Widgets Bm Library
+##
+XFE_STATIC_BM_LIB		= $(DIST)/lib/libXfeBm.a
+XFE_SHARED_BM_LIB		= $(DIST)/bin/libXfeBm.$(DLL_SUFFIX)
+XFE_BM_REQUIRES			= XfeBm
+
 ##
 ## Linux specific
 ##
@@ -185,6 +192,16 @@ XFE_STATIC_LIBS			+= $(XFE_STATIC_TEST_LIB)
 
 endif
 
+##
+## XfeBm required ?
+##
+ifeq ($(filter $(REQUIRES),$(XFE_BM_REQUIRES)),$(XFE_BM_REQUIRES))
+
+XFE_SHARED_LIBS			+= $(XFE_SHARED_BM_LIB)
+XFE_STATIC_LIBS			+= $(XFE_STATIC_BM_LIB)
+
+endif
+
 
 ##
 ## XfeWidgets required ?

mozilla/cmd/xfe/XfeWidgets/tests/Makefile

@@ -28,6 +28,7 @@ DEPTH			= ../../../..
 
 DIRS			= \
 				Xfe \
+				XfeBm \
 				XmL
 
 include $(DEPTH)/config/rules.mk

mozilla/cmd/xfe/XfeWidgets/tests/Xfe/Makefile

@@ -44,7 +44,6 @@ CSRCS			= \
 				DashBoardTest.c \
 				LabelTest.c \
 				LogoTest.c \
-				MenuTest.c \
 				PaneTestOne.c \
 				PaneTestThree.c \
 				PaneTestTwo.c \
@@ -59,7 +58,8 @@ CSRCS			= \
 
 REQUIRES		= \
 				XfeTest \
-				XfeWidgets
+				XfeWidgets \
+				XfeBm
 
 STATIC_PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=.static))
 SHARED_PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=.shared))

mozilla/cmd/xfe/XfeWidgets/tests/XfeBm/Makefile

@@ -0,0 +1,42 @@
+#! gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+# 
+
+DEPTH			= ../../../../..
+
+CSRCS			= \
+				MenuTest.c \
+				$(NULL)
+
+REQUIRES		= \
+				XfeTest \
+				XfeBm \
+				XfeWidgets
+
+STATIC_PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=.static))
+SHARED_PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=.shared))
+
+include $(DEPTH)/config/rules.mk
+include $(DEPTH)/cmd/xfe/XfeWidgets/XfeWidgets.mk
+
+all:: $(STATIC_PROGS) $(SHARED_PROGS)
+install:: $(STATIC_PROGS) $(SHARED_PROGS)
+
+shared: $(SHARED_PROGS)
+static: $(STATIC_PROGS)

mozilla/cmd/xfe/XfeWidgets/tests/XmL/Makefile

@@ -31,6 +31,7 @@ CSRCS			= \
 
 REQUIRES		= \
 				XfeWidgets \
+				XfeBm \
 				XfeTest \
 				Microline
 

mozilla/cmd/xfe/src/BookmarkBase.cpp

@@ -39,6 +39,8 @@
 #include "intl_csi.h"
 
 #include <Xfe/XfeAll.h>
+#include <Xfe/BmButton.h>
+#include <Xfe/BmCascade.h>
 
 #include <Xm/CascadeB.h>
 #include <Xm/PushB.h>

mozilla/cmd/xfe/src/BookmarkMenu.cpp

@@ -29,6 +29,8 @@
 #include "bkmks.h"
 
 #include <Xfe/XfeAll.h>
+#include <Xfe/BmButton.h>
+#include <Xfe/BmCascade.h>
 
 #define IS_CASCADE(w)	(XmIsCascadeButton(w) || XmIsCascadeButtonGadget(w))
 #define IS_PUSH(w)		(XmIsPushButton(w) || XmIsPushButtonGadget(w))

mozilla/cmd/xfe/src/Button.cpp

@@ -30,6 +30,7 @@
 
 #include <Xfe/Button.h>
 #include <Xfe/Cascade.h>
+#include <Xfe/BmButton.h>
 #include <Xfe/BmCascade.h>
 #include <Xm/XmAll.h>
 

mozilla/cmd/xfe/src/Makefile

@@ -27,6 +27,7 @@ LIBRARY_NAME	= xfe2
 
 REQUIRES	=\
 			XfeWidgets \
+			XfeBm \
 			Microline \
 			nspr \
 			layer \

mozilla/cmd/xfe/src/Menu.cpp

@@ -45,6 +45,7 @@
 #include <Xm/SeparatoG.h>
 
 #include <Xfe/Xfe.h>
+#include <Xfe/BmButton.h>
 #include <Xfe/BmCascade.h>