From 25331334d44db60fa60016f80a100ffec3daf38d Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Sat, 21 Nov 1998 12:47:07 +0000 Subject: [PATCH] * Changed fstream.* in wfstream.* git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/classes.tex | 1 + src/common/sckfile.cpp | 5 ++--- src/gtk.inc | 2 +- src/motif.inc | 2 +- src/motif/makefile.unx | 2 +- src/msw/makefile.b32 | 4 ++-- src/msw/makefile.dos | 4 ++-- src/msw/makefile.g95 | 2 +- src/msw/makefile.nt | 4 ++-- src/stubs.inc | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex index 55896f1778..7ca837dedd 100644 --- a/docs/latex/wx/classes.tex +++ b/docs/latex/wx/classes.tex @@ -153,6 +153,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$ \input size.tex \input sizeevt.tex \input slider.tex +\input sckaddr.tex \input socket.tex \input spinbutt.tex \input splitter.tex diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index 41686d09d8..81fe891009 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -23,9 +23,8 @@ #endif #include -#include -#include -#include "wx/protocol/file.h" +#include +#include #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) diff --git a/src/gtk.inc b/src/gtk.inc index 79dba955cf..b13843feb2 100644 --- a/src/gtk.inc +++ b/src/gtk.inc @@ -48,7 +48,7 @@ LIB_CPP_SRC=\ common/framecmn.cpp \ common/stream.cpp \ common/datstrm.cpp \ - common/fstream.cpp \ + common/wfstream.cpp \ common/mstream.cpp \ common/zstream.cpp \ common/objstrm.cpp \ diff --git a/src/motif.inc b/src/motif.inc index 92065e7c33..6eecd2425a 100644 --- a/src/motif.inc +++ b/src/motif.inc @@ -48,7 +48,7 @@ LIB_CPP_SRC=\ common/framecmn.cpp \ common/stream.cpp \ common/datstrm.cpp \ - common/fstream.cpp \ + common/wfstream.cpp \ common/mstream.cpp \ common/zstream.cpp \ common/objstrm.cpp \ diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx index 066a208ce4..a05e8a1282 100644 --- a/src/motif/makefile.unx +++ b/src/motif/makefile.unx @@ -52,7 +52,7 @@ LIB_CPP_SRC=\ ../common/framecmn.cpp \ ../common/stream.cpp \ ../common/datstrm.cpp \ - ../common/fstream.cpp \ + ../common/wfstream.cpp \ ../common/mstream.cpp \ ../common/zstream.cpp \ ../common/objstrm.cpp \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index b6db626851..f0429cb5e6 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -127,7 +127,7 @@ COMMONOBJS = \ $(MSWDIR)\wxexpr.obj \ $(MSWDIR)\y_tab.obj \ $(MSWDIR)\stream.obj \ - $(MSWDIR)\fstream.obj \ + $(MSWDIR)\wfstream.obj \ $(MSWDIR)\mstream.obj \ $(MSWDIR)\zstream.obj \ $(MSWDIR)\datstrm.obj \ @@ -542,7 +542,7 @@ $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF) $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF) -$(MSWDIR)\fstream.obj: $(COMMDIR)\fstream.$(SRCSUFF) +$(MSWDIR)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF) $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 48fe4ad6e3..2af601deb9 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -110,7 +110,7 @@ COMMONOBJS = \ $(COMMDIR)\time.obj \ $(COMMDIR)\y_tab.obj \ $(COMMDIR)\stream.obj \ - $(COMMDIR)\fstream.obj \ + $(COMMDIR)\wfstream.obj \ $(COMMDIR)\mstream.obj \ $(COMMDIR)\zstream.obj \ $(COMMDIR)\datstrm.obj \ @@ -853,7 +853,7 @@ $(COMMDIR)/stream.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/fstream.obj: $*.$(SRCSUFF) +$(COMMDIR)/wfstream.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 2219732e40..a1cbd58329 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -118,7 +118,7 @@ COMMONOBJS = \ $(COMMDIR)/tokenzr.$(OBJSUFF) \ $(COMMDIR)/y_tab.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \ - $(COMMDIR)/fstream.$(OBJSUFF) \ + $(COMMDIR)/wfstream.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \ $(COMMDIR)/zstream.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \ diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt index 5325dd3843..a8eb8fa988 100644 --- a/src/msw/makefile.nt +++ b/src/msw/makefile.nt @@ -133,7 +133,7 @@ COMMONOBJS = \ $(COMMDIR)\y_tab.obj \ $(COMMDIR)\extended.obj \ $(COMMDIR)\process.obj \ - $(COMMDIR)\fstream.obj \ + $(COMMDIR)\wfstream.obj \ $(COMMDIR)\mstream.obj \ $(COMMDIR)\zstream.obj \ $(COMMDIR)\stream.obj \ @@ -1002,7 +1002,7 @@ $(COMMDIR)\stream.obj: $*.$(SRCSUFF) $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ << -$(COMMDIR)\fstream.obj: $*.$(SRCSUFF) +$(COMMDIR)\wfstream.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ << diff --git a/src/stubs.inc b/src/stubs.inc index 2da8b4457c..67134cc577 100644 --- a/src/stubs.inc +++ b/src/stubs.inc @@ -47,7 +47,7 @@ LIB_CPP_SRC=\ common/framecmn.cpp \ common/stream.cpp \ common/datstrm.cpp \ - common/fstream.cpp \ + common/wfstream.cpp \ common/mstream.cpp \ common/zstream.cpp \ common/objstrm.cpp \ -- 2.45.2