* Changed fstream.* in wfstream.*

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

diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index 55896f1778a418cf8a000b799c12551c8b35df1b..7ca837deddf9565bc2f75a48c6c383b099bf6ea6 100644 (file)
--- 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 41686d09d8d808c7d93798f53c92cc2c389a6153..81fe891009107d7b6d14a6f5c5d544a025e7a1b6 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -23,9 +23,8 @@
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <wx/fstream.h>
-#include "wx/protocol/file.h"
+#include <wx/wfstream.h>
+#include <wx/protocol/file.h>
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)

diff --git a/src/gtk.inc b/src/gtk.inc
index 79dba955cf8e423186b9daafb48732278576e871..b13843feb2f807a46b525ce57e4b4584429f35a2 100644 (file)
--- 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 92065e7c3300e6e205f4fba1d9c9c5eb124da301..6eecd2425a0b43ce62a6f27de69404e32a7f19fa 100644 (file)
--- 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 066a208ce4f150f865c312b20bcc4db618e6ee62..a05e8a12822389aa933753c39734ec486083e7a8 100644 (file)
--- 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 b6db626851ed60469c737f143d15ed8d0c5c972c..f0429cb5e6e6292da3816d20575c1ea499682234 100644 (file)
--- 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 48fe4ad6e3a3869262ab4f2eed02fc4562fce432..2af601deb90e08158037bec70accb20729be0719 100644 (file)
--- 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 2219732e4065b59b07702aa6d166e210432659f2..a1cbd58329e1f3c8760b4428c76ec015e7f89433 100644 (file)
--- 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 5325dd38433107d39aa258062a718db502cd612a..a8eb8fa988a7eb5c3f2201f00219247f62745cc7 100644 (file)
--- 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 2da8b4457c387a5b97fb8bcf6b8e053b3aafed74..67134cc5777d33ed7e6e355b81bfb1ef14251f9e 100644 (file)
--- 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 \