added wxStd{In,Out}putStream classes (closes #10637)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-02 18:29:33 +00:00
parent 574be073c0
commit 72a7c55982
29 changed files with 1198 additions and 13 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -354,6 +354,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/regex.cpp
    src/common/stdpbase.cpp
    src/common/sstream.cpp
+    src/common/stdstream.cpp
    src/common/stopwatch.cpp
    src/common/strconv.cpp
    src/common/stream.cpp
@@ -485,6 +486,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/stack.h
    wx/stackwalk.h
    wx/stdpaths.h
+    wx/stdstream.h
    wx/stockitem.h
    wx/stopwatch.h
    wx/strconv.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -358,6 +358,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_regex.obj \
 	$(OBJS)\monodll_stdpbase.obj \
 	$(OBJS)\monodll_sstream.obj \
+	$(OBJS)\monodll_stdstream.obj \
 	$(OBJS)\monodll_stopwatch.obj \
 	$(OBJS)\monodll_strconv.obj \
 	$(OBJS)\monodll_stream.obj \
@@ -497,6 +498,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_regex.obj \
 	$(OBJS)\monolib_stdpbase.obj \
 	$(OBJS)\monolib_sstream.obj \
+	$(OBJS)\monolib_stdstream.obj \
 	$(OBJS)\monolib_stopwatch.obj \
 	$(OBJS)\monolib_strconv.obj \
 	$(OBJS)\monolib_stream.obj \
@@ -633,6 +635,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_regex.obj \
 	$(OBJS)\basedll_stdpbase.obj \
 	$(OBJS)\basedll_sstream.obj \
+	$(OBJS)\basedll_stdstream.obj \
 	$(OBJS)\basedll_stopwatch.obj \
 	$(OBJS)\basedll_strconv.obj \
 	$(OBJS)\basedll_stream.obj \
@@ -754,6 +757,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_regex.obj \
 	$(OBJS)\baselib_stdpbase.obj \
 	$(OBJS)\baselib_sstream.obj \
+	$(OBJS)\baselib_stdstream.obj \
 	$(OBJS)\baselib_stopwatch.obj \
 	$(OBJS)\baselib_strconv.obj \
 	$(OBJS)\baselib_stream.obj \
@@ -5558,6 +5562,9 @@ $(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\monodll_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp

@@ -7784,6 +7791,9 @@ $(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp

@@ -10010,6 +10020,9 @@ $(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp

@@ -10322,6 +10335,9 @@ $(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -344,6 +344,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_regex.o \
 	$(OBJS)\monodll_stdpbase.o \
 	$(OBJS)\monodll_sstream.o \
+	$(OBJS)\monodll_stdstream.o \
 	$(OBJS)\monodll_stopwatch.o \
 	$(OBJS)\monodll_strconv.o \
 	$(OBJS)\monodll_stream.o \
@@ -484,6 +485,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_regex.o \
 	$(OBJS)\monolib_stdpbase.o \
 	$(OBJS)\monolib_sstream.o \
+	$(OBJS)\monolib_stdstream.o \
 	$(OBJS)\monolib_stopwatch.o \
 	$(OBJS)\monolib_strconv.o \
 	$(OBJS)\monolib_stream.o \
@@ -622,6 +624,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_regex.o \
 	$(OBJS)\basedll_stdpbase.o \
 	$(OBJS)\basedll_sstream.o \
+	$(OBJS)\basedll_stdstream.o \
 	$(OBJS)\basedll_stopwatch.o \
 	$(OBJS)\basedll_strconv.o \
 	$(OBJS)\basedll_stream.o \
@@ -743,6 +746,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_regex.o \
 	$(OBJS)\baselib_stdpbase.o \
 	$(OBJS)\baselib_sstream.o \
+	$(OBJS)\baselib_stdstream.o \
 	$(OBJS)\baselib_stopwatch.o \
 	$(OBJS)\baselib_strconv.o \
 	$(OBJS)\baselib_stream.o \
@@ -5710,6 +5714,9 @@ $(OBJS)\monodll_stdpbase.o: ../../src/common/stdpbase.cpp
 $(OBJS)\monodll_sstream.o: ../../src/common/sstream.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_stdstream.o: ../../src/common/stdstream.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_stopwatch.o: ../../src/common/stopwatch.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -8048,6 +8055,9 @@ $(OBJS)\monolib_stdpbase.o: ../../src/common/stdpbase.cpp
 $(OBJS)\monolib_sstream.o: ../../src/common/sstream.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_stdstream.o: ../../src/common/stdstream.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_stopwatch.o: ../../src/common/stopwatch.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -10386,6 +10396,9 @@ $(OBJS)\basedll_stdpbase.o: ../../src/common/stdpbase.cpp
 $(OBJS)\basedll_sstream.o: ../../src/common/sstream.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\basedll_stdstream.o: ../../src/common/stdstream.cpp
+	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_stopwatch.o: ../../src/common/stopwatch.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -10698,6 +10711,9 @@ $(OBJS)\baselib_stdpbase.o: ../../src/common/stdpbase.cpp
 $(OBJS)\baselib_sstream.o: ../../src/common/sstream.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\baselib_stdstream.o: ../../src/common/stdstream.cpp
+	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_stopwatch.o: ../../src/common/stopwatch.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -359,6 +359,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_regex.obj \
 	$(OBJS)\monodll_stdpbase.obj \
 	$(OBJS)\monodll_sstream.obj \
+	$(OBJS)\monodll_stdstream.obj \
 	$(OBJS)\monodll_stopwatch.obj \
 	$(OBJS)\monodll_strconv.obj \
 	$(OBJS)\monodll_stream.obj \
@@ -503,6 +504,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_regex.obj \
 	$(OBJS)\monolib_stdpbase.obj \
 	$(OBJS)\monolib_sstream.obj \
+	$(OBJS)\monolib_stdstream.obj \
 	$(OBJS)\monolib_stopwatch.obj \
 	$(OBJS)\monolib_strconv.obj \
 	$(OBJS)\monolib_stream.obj \
@@ -645,6 +647,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_regex.obj \
 	$(OBJS)\basedll_stdpbase.obj \
 	$(OBJS)\basedll_sstream.obj \
+	$(OBJS)\basedll_stdstream.obj \
 	$(OBJS)\basedll_stopwatch.obj \
 	$(OBJS)\basedll_strconv.obj \
 	$(OBJS)\basedll_stream.obj \
@@ -771,6 +774,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_regex.obj \
 	$(OBJS)\baselib_stdpbase.obj \
 	$(OBJS)\baselib_sstream.obj \
+	$(OBJS)\baselib_stdstream.obj \
 	$(OBJS)\baselib_stopwatch.obj \
 	$(OBJS)\baselib_strconv.obj \
 	$(OBJS)\baselib_stream.obj \
@@ -5904,6 +5908,9 @@ $(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\monodll_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp

@@ -8130,6 +8137,9 @@ $(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp

@@ -10356,6 +10366,9 @@ $(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp

@@ -10668,6 +10681,9 @@ $(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp

+$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp

--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -3464,6 +3464,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_regex.obj &
 	$(OBJS)\monodll_stdpbase.obj &
 	$(OBJS)\monodll_sstream.obj &
+	$(OBJS)\monodll_stdstream.obj &
 	$(OBJS)\monodll_stopwatch.obj &
 	$(OBJS)\monodll_strconv.obj &
 	$(OBJS)\monodll_stream.obj &
@@ -3603,6 +3604,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_regex.obj &
 	$(OBJS)\monolib_stdpbase.obj &
 	$(OBJS)\monolib_sstream.obj &
+	$(OBJS)\monolib_stdstream.obj &
 	$(OBJS)\monolib_stopwatch.obj &
 	$(OBJS)\monolib_strconv.obj &
 	$(OBJS)\monolib_stream.obj &
@@ -3740,6 +3742,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_regex.obj &
 	$(OBJS)\basedll_stdpbase.obj &
 	$(OBJS)\basedll_sstream.obj &
+	$(OBJS)\basedll_stdstream.obj &
 	$(OBJS)\basedll_stopwatch.obj &
 	$(OBJS)\basedll_strconv.obj &
 	$(OBJS)\basedll_stream.obj &
@@ -3861,6 +3864,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_regex.obj &
 	$(OBJS)\baselib_stdpbase.obj &
 	$(OBJS)\baselib_sstream.obj &
+	$(OBJS)\baselib_stdstream.obj &
 	$(OBJS)\baselib_stopwatch.obj &
 	$(OBJS)\baselib_strconv.obj &
 	$(OBJS)\baselib_stream.obj &
@@ -5959,6 +5963,9 @@ $(OBJS)\monodll_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
 $(OBJS)\monodll_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

+$(OBJS)\monodll_stdstream.obj :  .AUTODEPEND ..\..\src\common\stdstream.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -8297,6 +8304,9 @@ $(OBJS)\monolib_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
 $(OBJS)\monolib_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

+$(OBJS)\monolib_stdstream.obj :  .AUTODEPEND ..\..\src\common\stdstream.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -10635,6 +10645,9 @@ $(OBJS)\basedll_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
 $(OBJS)\basedll_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

+$(OBJS)\basedll_stdstream.obj :  .AUTODEPEND ..\..\src\common\stdstream.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

@@ -10947,6 +10960,9 @@ $(OBJS)\baselib_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
 $(OBJS)\baselib_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

+$(OBJS)\baselib_stdstream.obj :  .AUTODEPEND ..\..\src\common\stdstream.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -467,6 +467,10 @@ SOURCE=..\..\src\common\stdpbase.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\src\common\stdstream.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\stopwatch.cpp
 # End Source File
 # Begin Source File
@@ -1419,6 +1423,10 @@ SOURCE=..\..\include\wx\stdpaths.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\stdstream.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\stockitem.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -785,6 +785,9 @@
 			<File
 				RelativePath="..\..\src\common\stdpbase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\stdstream.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\stopwatch.cpp">
 			</File>
@@ -1490,6 +1493,9 @@
 			<File
 				RelativePath="..\..\include\wx\stdpaths.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\stdstream.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stockitem.h">
 			</File>
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1082,6 +1082,10 @@
 				RelativePath="..\..\src\common\stdpbase.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\stdstream.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stopwatch.cpp"
 				>
@@ -2007,6 +2011,10 @@
 				RelativePath="..\..\include\wx\stdpaths.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\stdstream.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stockitem.h"
 				>
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1078,6 +1078,10 @@
 				RelativePath="..\..\src\common\stdpbase.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\stdstream.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stopwatch.cpp"
 				>
@@ -2003,6 +2007,10 @@
 				RelativePath="..\..\include\wx\stdpaths.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\stdstream.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stockitem.h"
 				>