? src/af/xap/win/xap_Win32EncodingManager.cpp
? src/af/xap/win/xap_Win32EncodingManager.h
Index: src/af/xap//Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/xap/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- src/af/xap//Makefile	2001/03/07 17:06:12	1.59
+++ src/af/xap//Makefile	2001/04/11 08:12:31
@@ -79,7 +79,8 @@
 ifeq ($(ABI_FE), Win32)
 PLATFORM_OBJS +=	$(OBJDIR)/xap_$(ABI_FE)Slurp.$(OBJ_SUFFIX)		\
 			$(OBJDIR)/xap_$(ABI_FE)PreviewWidget.$(OBJ_SUFFIX)		\
-			$(OBJDIR)/xap_$(ABI_FE)DialogHelper.$(OBJ_SUFFIX)
+			$(OBJDIR)/xap_$(ABI_FE)DialogHelper.$(OBJ_SUFFIX)	\
+			$(OBJDIR)/xap_$(ABI_FE)EncodingManager.$(OBJ_SUFFIX)
 endif
 
 ifdef ABI_OPT_GNOME
Index: src/af/xap//win/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/xap/win/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- src/af/xap//win/Makefile	2001/03/07 15:45:45	1.30
+++ src/af/xap//win/Makefile	2001/04/11 08:12:33
@@ -39,10 +39,27 @@
 			xap_Win32Slurp.cpp			\
 			xap_Win32Toolbar_Icons.cpp	\
 			xap_Win32DialogHelper.cpp		\
-			xap_Win32Module.cpp
+			xap_Win32Module.cpp			\
+			xap_Win32EncodingManager.cpp
 
 TARGETS=		$(OBJS)
 
 include $(ABI_ROOT)/src/config/abi_rules.mk
+
+# Win32 must build libiconv as a peer, Unix should either
+# have iconv.h available as part of its C library (GNU libc
+# systems) or have it installed as part of the libiconv-1.0
+# package.
+
+# Test for iconv in system locations
+HAVE_ICONV_SYSTEM := $(shell if [ -r /usr/include/iconv.h -o -r /usr/local/include/iconv.h ] ; then echo 1 ; fi)
+
+ifeq ($(OS_NAME), WIN32)
+INCLUDES=		-I$(ABI_XX_ROOT)/../libiconv/include
+else
+ifneq ($(HAVE_ICONV_SYSTEM),1)
+INCLUDES= 		-I$(ABI_ROOT)/../libiconv/include
+endif
+endif
 
 build:: $(TARGETS)
Index: src/af/xap//win/xap_Win32App.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32App.cpp,v
retrieving revision 1.40
diff -u -r1.40 xap_Win32App.cpp
--- src/af/xap//win/xap_Win32App.cpp	2001/03/19 04:01:31	1.40
+++ src/af/xap//win/xap_Win32App.cpp	2001/04/11 08:12:34
@@ -29,6 +29,7 @@
 #include "xap_Win32_TB_CFactory.h"
 #include "xap_Win32Slurp.h"
 #include "xap_Win32Module.h"
+#include "xap_Win32EncodingManager.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)	// 'this' used in base member initializer list
@@ -45,6 +46,9 @@
 	UT_ASSERT(hInstance);
 
 	_setAbiSuiteLibDir();
+
+	DELETEP(m_pEncMgr);
+	m_pEncMgr = new XAP_Win32EncodingManager();
 }
 
 XAP_Win32App::~XAP_Win32App(void)