Removed layers references

include/fe_proto.h

@@ -731,7 +731,7 @@ extern int      FE_GetTextInfo(MWContext * context, LO_TextStruct *text, LO_Text
 #ifdef XP_OS2       /* performance   */
 extern int      FE_GetMaxWidth(MWContext *pContext, LO_TextStruct *pText); /* performance */
 #endif
-#ifdef LAYERS
+#if 0
 void		FE_GetTextFrame(MWContext * context, LO_TextStruct *text, int32 start, int32 end, XP_Rect *frame);
 #endif
 #ifndef MOZ_NGLAYOUT
@@ -784,7 +784,7 @@ void        FE_DisplayBullet(MWContext *context, int iLocation, LO_BullettStruct
 void        FE_DisplayFormElement(MWContext * context, int iLocation, LO_FormElementStruct * form_element);
 void        FE_DisplayBorder(MWContext *context, int iLocation, int x, int y, int width, int height, int bw, LO_Color *color, LO_LineStyle style);
 void        FE_DisplayFeedback(MWContext *context, int iLocation, LO_Element *element);
-#ifdef LAYERS
+#if 0
 void        FE_EraseBackground(MWContext * context, int iLocation, int32 x, int32 y, uint32 width, uint32 height, LO_Color *bg);
 void        FE_SetClipRegion(MWContext *context, int iLocation, FE_Region region);
 #endif
@@ -1196,7 +1196,7 @@ void FE_ClickInputElement(MWContext *window, LO_Element *element);
 
 char *FE_GetAcceptLanguage(void);
 
-#ifdef LAYERS
+#if 0
 PRBool FE_HandleLayerEvent(MWContext *context, CL_Layer *layer, 
                            CL_Event *event);
 PRBool FE_HandleEmbedEvent(MWContext *context, LO_EmbedStruct *embed,

include/libevent.h

@@ -131,7 +131,7 @@ typedef void
  * in a resize_relayout.
  */
  typedef void
- (*ETRestoreAckFunc)(void * data, LO_BlockInitializeStruct *param);
+ (*ETRestoreAckFunc)(void * data, void *param);
 
 /*
  * Typedef for a function taking a void pointer and
@@ -576,7 +576,7 @@ ET_PostEvalAck(MWContext * context, int doc_id, void * data,
 	       char * base_href, Bool valid, ETEvalAckFunc fn);
 
 extern void
-ET_PostRestoreAck(void *data, LO_BlockInitializeStruct *param, 
+ET_PostRestoreAck(void *data, void *param, 
                   ETRestoreAckFunc fn);
 
 /* netlib events */
@@ -734,13 +734,13 @@ typedef enum {
 } ETLayerOp;
 
 extern int
-ET_TweakLayer(MWContext * context, CL_Layer * layer, int32 x, int32 y, 
+ET_TweakLayer(MWContext * context, void * layer, int32 x, int32 y, 
               void *param_ptr, int32 param_val, ETLayerOp op,
 	      const char *referer, int32 doc_id);
 
 extern void
 ET_RestoreLayerState(MWContext *context, int32 layer_id,
-                     LO_BlockInitializeStruct *param, ETRestoreAckFunc fn,
+                     void *param, ETRestoreAckFunc fn,
                      void *data);
 
 extern int32

include/lo_ele.h

@@ -30,6 +30,8 @@
 #ifndef _LayoutElements_
 #define _LayoutElements_
 
+#if 0
+
 
 #include "xp_core.h"
 #include "xp_mem.h"
@@ -1443,4 +1445,6 @@ typedef enum LO_LayerType_enum {
 
 #define LO_DOCUMENT_LAYER_ID 0
 
+#endif
+
 #endif /* _LayoutElements_ */

include/mk_cx_fn.h

@@ -146,7 +146,7 @@ FE_DEFINE(AllConnectionsComplete,void,(MWContext * context))
 #ifdef XP_OS2       /* performance */
 FE_DEFINE(GetMaxWidth,int, (MWContext * context, LO_TextStruct *text))
 #endif
-#ifdef LAYERS
+#if 0
 FE_DEFINE(EraseBackground, void, (MWContext *, int, int32, int32, uint32, uint32, LO_Color *))
 FE_DEFINE(SetDrawable, void, (MWContext *, CL_Drawable *))
 FE_DEFINE(GetTextFrame, void, (MWContext *, LO_TextStruct *, int32, int32, XP_Rect *))

include/proto.h

@@ -88,7 +88,7 @@ extern void LO_RefreshArea(MWContext *context, int32 left, int32 top,
 	uint32 width, uint32 height);
 extern Bool LO_CheckForUnload(MWContext *context);
 
-#ifdef LAYERS
+#if 0
 extern void LO_MoveLayer(CL_Layer *layer, int32 x, int32 y);
 extern int32 LO_GetLayerXOffset(CL_Layer *layer);
 extern int32 LO_GetLayerYOffset(CL_Layer *layer);
@@ -156,7 +156,7 @@ extern int32 LO_GetNumberOfLayers(MWContext *context);
 #endif
 extern NET_ReloadMethod LO_GetReloadMethod(MWContext *context);
 
-#ifdef LAYERS 
+#if 0
 extern LO_Element *LO_XYToElement(MWContext *, int32, int32, CL_Layer *);
 extern LO_Element *LO_XYToNearestElement(MWContext *, int32, int32, 
                                          CL_Layer *);
@@ -198,7 +198,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);
-#ifdef LAYERS
+#if 0
 extern void LO_StartSelection(MWContext *context, int32 x, int32 y, 
                               CL_Layer *layer);
 #else
@@ -237,7 +237,7 @@ extern void LO_SelectText(MWContext *context, LO_Element *start,int32 start_pos,
 extern void LO_RefreshAnchors(MWContext *context);
 extern Bool LO_HaveSelection(MWContext *context);
 extern void LO_GetSelectionEndpoints(MWContext *context,
-	LO_Element **start, LO_Element **end, int32 *start_pos, int32 *end_pos, CL_Layer **sel_layer);
+	LO_Element **start, LO_Element **end, int32 *start_pos, int32 *end_pos, void **sel_layer);
 extern void LO_FreeSubmitData(LO_FormSubmitData *submit_data);
 extern void LO_FreeDocumentFormListData(MWContext *context, void *form_data);
 extern void LO_FreeDocumentEmbedListData(MWContext *context, void *embed_data);
@@ -292,7 +292,7 @@ extern void SI_UnanonymizeSignons();
 extern void SI_StartOfForm();
 #endif
 
-#ifdef LAYERS
+#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,
@@ -399,14 +399,14 @@ 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
 
-#ifdef LAYERS
+#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 */
 
-#ifdef 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);

include/structs.h

@@ -250,7 +250,7 @@ struct MWContext_ {
 								   display this string.  libmsg changes this
 								   string all the time for mail and news
 								   contexts. */
-#ifdef LAYERS
+#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 */