Removing all traces of the old LAYERS #define. r=jst, sr=cls.

config/autoconf.mk.in

@@ -301,12 +301,6 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
 MOZ_FULLCIRCLE	= @MOZ_FULLCIRCLE@
 FULLCIRCLE_LIBS	= @FULLCIRCLE_LIBS@
 
-# Pulled these out of configure.in,
-# so undefine them now instead of subst
-MOZ_NETCAST	=
-MOZ_LDAP	=
-SMART_MAIL	=
-
 # XXX - these need to be cleaned up and have real checks added -cls
 CM_BLDTYPE=dbg 
 AWT_11=1 

config/config.mak

@@ -129,9 +129,9 @@ CFGFILE=$(OBJDIR)\cmd.cfg
 INCS=$(INCS) -I$(PUBLIC) -I$(DIST)\include
 
 !if "$(MOZ_BITS)" == "16"
-CFLAGS=$(MOZ_JAVA_FLAG) -DLAYERS -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)
+CFLAGS=$(MOZ_JAVA_FLAG) -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)
 !else
-CFLAGS=$(MOZ_JAVA_FLAG) -DLAYERS $(OS_CFLAGS) $(MOZ_CFLAGS)
+CFLAGS=$(MOZ_JAVA_FLAG) $(OS_CFLAGS) $(MOZ_CFLAGS)
 !endif
 
 LFLAGS=$(OS_LFLAGS) $(LLFLAGS) $(MOZ_LFLAGS)

config/mac/DefinesMozilla.h

@@ -82,7 +82,6 @@
 	#define UNICODE_FONTLIST 1
 #endif
 
-#define LAYERS	1
 // #define NU_CACHE 1 // uncomment to turn on new memory cache features
 
 //#define CASTED_READ_OBJECT(stream, type, reference) (reference = NULL)

configure.in

@@ -3734,7 +3734,6 @@ AC_SUBST(MOZ_MNG)
 AC_SUBST(MOZ_MONOLITHIC_TOOLKIT)
 AC_SUBST(MOZ_JS_LIBS)
 AC_SUBST(MOZ_SECURITY)
-dnl AC_SUBST(MOZ_NETCAST)
 AC_SUBST(BUILD_MODULES)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_MODULES)
@@ -3757,7 +3756,6 @@ AC_SUBST(MOZ_INSURE_DIRS)
 AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
 AC_SUBST(MOZ_INSURIFYING)
 AC_SUBST(MOZ_BUILD_XPFE)
-dnl AC_SUBST(MOZ_LDAP)
 AC_SUBST(MOZ_LDAP_XPCOM)
 
 AC_SUBST(UNIX_CRASH_ON_ASSERT)
@@ -3766,7 +3764,6 @@ AC_SUBST(NO_SHARED_LIB)
 AC_SUBST(NO_STATIC_LIB)
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(MOZ_USER_DIR)
-dnl AC_SUBST(MOZ_SMART_MAIL)
 AC_SUBST(FULL_STATIC_BUILD)
 AC_SUBST(BUILD_IDLC)
 
@@ -4128,7 +4125,6 @@ else
 fi
 
 AC_DEFINE(JS_THREADSAFE)
-AC_DEFINE(LAYERS)
 
 
 # Used for LD_LIBRARY_PATH of run_viewer target

include/proto.h

@@ -160,14 +160,8 @@ extern int32 LO_GetNumberOfLayers(MWContext *context);
 #endif
 extern NET_ReloadMethod LO_GetReloadMethod(MWContext *context);
 
-#if 0
-extern LO_Element *LO_XYToElement(MWContext *, int32, int32, CL_Layer *);
-extern LO_Element *LO_XYToNearestElement(MWContext *, int32, int32, 
-                                         CL_Layer *);
-#else
 extern LO_Element *LO_XYToElement(MWContext *, int32, int32);
 extern LO_Element *LO_XYToNearestElement(MWContext *, int32, int32);
-#endif /* LAYERS */
 
 extern void LO_MoveGridEdge(MWContext *context, LO_EdgeStruct *edge,
 	int32 x, int32 y);
@@ -202,12 +196,7 @@ extern void LO_SetDocumentPosition(MWContext *context, int32 x, int32 y);
 #endif /* OLD_POS_HIST */
 extern void LO_SetDocumentDimensions(MWContext *context,
                                      int32 width, int32 height);
-#if 0
-extern void LO_StartSelection(MWContext *context, int32 x, int32 y, 
-                              CL_Layer *layer);
-#else
 extern void LO_StartSelection(MWContext *context, int32 x, int32 y);
-#endif /* LAYERS */
 
 typedef enum {
 	SMALL_BM_ICON,
@@ -294,16 +283,9 @@ extern void SI_UnanonymizeSignons();
 extern void SI_StartOfForm();
 #endif
 
-#if 0
-extern Bool LO_Click( MWContext *context, int32 x, int32 y, 
-                      Bool requireCaret, CL_Layer *layer );
-extern void LO_Hit(MWContext *context, int32 x, int32 y,
-	Bool requireCaret, LO_HitResult *result, CL_Layer *layer);
-#else
 extern Bool LO_Click( MWContext *context, int32 x, int32 y, Bool requireCaret );
 extern void LO_Hit(MWContext *context, int32 x, int32 y,
 	Bool requireCaret, LO_HitResult *result);
-#endif /* LAYERS */
 /* Similar to lo_Click, but doesn't process click
    Returns TRUE if line would be selected if user clicked here
    We only use this in Editor, so we can assume "layer" is NULL
@@ -332,15 +314,8 @@ extern void LO_UpdateTextData(lo_FormElementTextData * textData, const char * te
  */
 
 
-#if 0
-extern void LO_PositionCaret( MWContext *context, int32 x, int32 y,
-                              CL_Layer *layer);
-extern void LO_DoubleClick( MWContext *context, int32 x, int32 y, 
-                            CL_Layer *layer );
-#else
 extern void LO_PositionCaret( MWContext *context, int32 x, int32 y );
 extern void LO_DoubleClick( MWContext *context, int32 x, int32 y );
-#endif /* LAYERS */
 
 void LO_PositionCaretBounded(MWContext *context, int32 x, int32 y,
 			int32 minY, int32 maxY );
@@ -362,13 +337,8 @@ extern LO_Element* LO_BeginOfLine( MWContext *pContext, LO_Element *pElement );
 extern LO_Element* LO_EndOfLine( MWContext *pContext, LO_Element *pElement);
 extern LO_Element* LO_FirstElementOnLine( MWContext *pContext,
 	int32 x, int32 y, int32 *pLineNum);
-#if 0
-extern void LO_StartSelectionFromElement( MWContext *context, LO_Element *eptr, 
-            int32 new_pos, CL_Layer *layer );
-#else
 extern void LO_StartSelectionFromElement( MWContext *context, LO_Element *eptr, 
             int32 new_pos );
-#endif /* LAYERS */
 extern void LO_ExtendSelectionFromElement( MWContext *context, LO_Element *eptr, 
             int32 position, Bool bFromStart );
 extern Bool LO_SelectElement( MWContext *context, LO_Element *eptr, 
@@ -401,21 +371,7 @@ extern Bool LO_Click( MWContext *context, int32 x, int32 y, Bool requireCaret );
 extern void LO_Hit(MWContext *context, int32 x, int32 y, Bool requireCaret, LO_HitResult *result);
 #endif
 
-#if 0
-extern void LO_SelectObject( MWContext *context, int32 x, int32 y,
-                             CL_Layer *layer );
-#else
 extern void LO_SelectObject( MWContext *context, int32 x, int32 y );
-#endif /* LAYERS */
-
-#if 0
-extern LO_LayerType LO_GetLayerType(CL_Layer *layer);
-extern Bool LO_PrepareLayerForWriting(MWContext *context, int32 layer_id, 
-                                      const char *referer, int32 width);
-extern Bool LO_SetLayerSrc(MWContext *context, int32 layer_id, char *str, 
-                           const char *referer, int32 width);
-extern int32 LO_CreateNewLayer(MWContext *context, int32 wrap_width, int32 parent_layer_id);
-#endif /* LAYERS */
 
 #ifdef XP_UNIX
 extern void LO_DisplayFormElement(LO_FormElementStruct *form);

include/structs.h

@@ -254,12 +254,6 @@ struct MWContext_ {
 								   display this string.  libmsg changes this
 								   string all the time for mail and news
 								   contexts. */
-#if 0
-	CL_Compositor *compositor;  /* The compositor associated with this context */
-	XP_Bool blink_hidden;       /* State of blink layers */
-	void *blink_timeout;        /* Timeout used for blink hiding/unhiding */
-#endif /* LAYERS */
-
 	int32      doc_id;			/* unique identifier for generated documents */
 	int32      context_id;			/* unique identifier for context */