Removed rogue AIAI icon; removed PostScript files from Cygwin makefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/docview/aiai.ico b/samples/docview/aiai.ico
deleted file mode 100644 (file)
index a3db656..0000000
Binary files a/samples/docview/aiai.ico and /dev/null differ

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index b98ea796ee8bdf0a8a299b23feeeacd5ac0ec6fe..cffc8f2cd7e21f74d9b49603ec046431f95973bc 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -67,8 +67,6 @@ GENERICOBJS= \
   $(GENDIR)/laywin.$(OBJSUFF) \
   $(GENDIR)/msgdlgg.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \
-  $(GENDIR)/printps.$(OBJSUFF) \
-  $(GENDIR)/prntdlgg.$(OBJSUFF) \
   $(GENDIR)/sashwin.$(OBJSUFF) \
   $(GENDIR)/scrolwin.$(OBJSUFF) \
   $(GENDIR)/splitter.$(OBJSUFF) \
@@ -76,6 +74,9 @@ GENERICOBJS= \
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 
+#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+#  $(GENDIR)/printps.$(OBJSUFF) \
+
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
@@ -96,7 +97,6 @@ COMMONOBJS = \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/postscrp.$(OBJSUFF) \
   $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
@@ -134,8 +134,7 @@ COMMONOBJS = \
   $(COMMDIR)/url.$(OBJSUFF) \
   $(COMMDIR)/wincmn.$(OBJSUFF)
 
-# This must be renamed! It conflicts with the g++ fstream.h.
-#  $(COMMDIR)/fstream.$(OBJSUFF) \
+#  $(COMMDIR)/postscrp.$(OBJSUFF) \
 
 # NOTE: if the socket-related files above fail with a syntax error in Sockets.h,
 # remove the files (probably all GnuWin32 releases < b20).