Remove dynarray.cpp source file

After the recent dynamic array macros refactoring, there was no
implementation of wxBaseArray any more and only wxArrayString-related
code remained in this file, so just move the latter to arrstr.cpp, where
it should have been put from the beginning (except that this code
probably predates arrstr.cpp addition), and remove the old file
entirely.

Makefile.in

@@ -780,7 +780,6 @@ ALL_BASE_SOURCES =  \
 	src/common/datetimefmt.cpp \
 	src/common/datstrm.cpp \
 	src/common/dircmn.cpp \
-	src/common/dynarray.cpp \
 	src/common/dynlib.cpp \
 	src/common/dynload.cpp \
 	src/common/encconv.cpp \
@@ -964,7 +963,6 @@ MONODLL_OBJECTS =  \
 	monodll_datetimefmt.o \
 	monodll_datstrm.o \
 	monodll_dircmn.o \
-	monodll_dynarray.o \
 	monodll_dynlib.o \
 	monodll_dynload.o \
 	monodll_encconv.o \
@@ -1107,7 +1105,6 @@ MONOLIB_OBJECTS =  \
 	monolib_datetimefmt.o \
 	monolib_datstrm.o \
 	monolib_dircmn.o \
-	monolib_dynarray.o \
 	monolib_dynlib.o \
 	monolib_dynload.o \
 	monolib_encconv.o \
@@ -1239,7 +1236,6 @@ BASEDLL_OBJECTS =  \
 	basedll_datetimefmt.o \
 	basedll_datstrm.o \
 	basedll_dircmn.o \
-	basedll_dynarray.o \
 	basedll_dynlib.o \
 	basedll_dynload.o \
 	basedll_encconv.o \
@@ -1354,7 +1350,6 @@ BASELIB_OBJECTS =  \
 	baselib_datetimefmt.o \
 	baselib_datstrm.o \
 	baselib_dircmn.o \
-	baselib_dynarray.o \
 	baselib_dynlib.o \
 	baselib_dynload.o \
 	baselib_encconv.o \
@@ -16058,9 +16053,6 @@ monodll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONODLL_ODEP)
 monodll_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-monodll_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 monodll_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -21320,9 +21312,6 @@ monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONOLIB_ODEP)
 monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-monolib_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 monolib_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -26582,9 +26571,6 @@ basedll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASEDLL_ODEP)
 basedll_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-basedll_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(BASEDLL_ODEP)
-	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 basedll_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -27062,9 +27048,6 @@ baselib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASELIB_ODEP)
 baselib_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-baselib_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(BASELIB_ODEP)
-	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 baselib_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -37615,7 +37598,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
@@ -37842,7 +37824,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 

build/bakefiles/files.bkl

@@ -473,7 +473,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/datetimefmt.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
-    src/common/dynarray.cpp
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp

build/cmake/files.cmake

@@ -385,7 +385,6 @@ set(BASE_CMN_SRC
     src/common/datetimefmt.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
-    src/common/dynarray.cpp
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp

build/files

@@ -406,7 +406,6 @@ BASE_CMN_SRC =
     src/common/datetimefmt.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
-    src/common/dynarray.cpp
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp

build/msw/makefile.bcc

@@ -382,7 +382,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_datetimefmt.obj \
 	$(OBJS)\monodll_datstrm.obj \
 	$(OBJS)\monodll_dircmn.obj \
-	$(OBJS)\monodll_dynarray.obj \
 	$(OBJS)\monodll_dynlib.obj \
 	$(OBJS)\monodll_dynload.obj \
 	$(OBJS)\monodll_encconv.obj \
@@ -535,7 +534,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_datetimefmt.obj \
 	$(OBJS)\monolib_datstrm.obj \
 	$(OBJS)\monolib_dircmn.obj \
-	$(OBJS)\monolib_dynarray.obj \
 	$(OBJS)\monolib_dynlib.obj \
 	$(OBJS)\monolib_dynload.obj \
 	$(OBJS)\monolib_encconv.obj \
@@ -684,7 +682,6 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_datetimefmt.obj \
 	$(OBJS)\basedll_datstrm.obj \
 	$(OBJS)\basedll_dircmn.obj \
-	$(OBJS)\basedll_dynarray.obj \
 	$(OBJS)\basedll_dynlib.obj \
 	$(OBJS)\basedll_dynload.obj \
 	$(OBJS)\basedll_encconv.obj \
@@ -818,7 +815,6 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_datetimefmt.obj \
 	$(OBJS)\baselib_datstrm.obj \
 	$(OBJS)\baselib_dircmn.obj \
-	$(OBJS)\baselib_dynarray.obj \
 	$(OBJS)\baselib_dynlib.obj \
 	$(OBJS)\baselib_dynload.obj \
 	$(OBJS)\baselib_encconv.obj \
@@ -6475,9 +6471,6 @@ $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -9024,9 +9017,6 @@ $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -11573,9 +11563,6 @@ $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -11921,9 +11908,6 @@ $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 

build/msw/makefile.gcc

@@ -370,7 +370,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_datetimefmt.o \
 	$(OBJS)\monodll_datstrm.o \
 	$(OBJS)\monodll_dircmn.o \
-	$(OBJS)\monodll_dynarray.o \
 	$(OBJS)\monodll_dynlib.o \
 	$(OBJS)\monodll_dynload.o \
 	$(OBJS)\monodll_encconv.o \
@@ -524,7 +523,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_datetimefmt.o \
 	$(OBJS)\monolib_datstrm.o \
 	$(OBJS)\monolib_dircmn.o \
-	$(OBJS)\monolib_dynarray.o \
 	$(OBJS)\monolib_dynlib.o \
 	$(OBJS)\monolib_dynload.o \
 	$(OBJS)\monolib_encconv.o \
@@ -674,7 +672,6 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_datetimefmt.o \
 	$(OBJS)\basedll_datstrm.o \
 	$(OBJS)\basedll_dircmn.o \
-	$(OBJS)\basedll_dynarray.o \
 	$(OBJS)\basedll_dynlib.o \
 	$(OBJS)\basedll_dynload.o \
 	$(OBJS)\basedll_encconv.o \
@@ -808,7 +805,6 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_datetimefmt.o \
 	$(OBJS)\baselib_datstrm.o \
 	$(OBJS)\baselib_dircmn.o \
-	$(OBJS)\baselib_dynarray.o \
 	$(OBJS)\baselib_dynlib.o \
 	$(OBJS)\baselib_dynload.o \
 	$(OBJS)\baselib_encconv.o \
@@ -6657,9 +6653,6 @@ $(OBJS)\monodll_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\monodll_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9208,9 +9201,6 @@ $(OBJS)\monolib_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\monolib_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -11759,9 +11749,6 @@ $(OBJS)\basedll_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\basedll_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\basedll_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\basedll_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -12107,9 +12094,6 @@ $(OBJS)\baselib_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\baselib_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\baselib_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\baselib_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 

build/msw/makefile.vc

@@ -402,7 +402,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_datetimefmt.obj \
 	$(OBJS)\monodll_datstrm.obj \
 	$(OBJS)\monodll_dircmn.obj \
-	$(OBJS)\monodll_dynarray.obj \
 	$(OBJS)\monodll_dynlib.obj \
 	$(OBJS)\monodll_dynload.obj \
 	$(OBJS)\monodll_encconv.obj \
@@ -565,7 +564,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_datetimefmt.obj \
 	$(OBJS)\monolib_datstrm.obj \
 	$(OBJS)\monolib_dircmn.obj \
-	$(OBJS)\monolib_dynarray.obj \
 	$(OBJS)\monolib_dynlib.obj \
 	$(OBJS)\monolib_dynload.obj \
 	$(OBJS)\monolib_encconv.obj \
@@ -722,7 +720,6 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_datetimefmt.obj \
 	$(OBJS)\basedll_datstrm.obj \
 	$(OBJS)\basedll_dircmn.obj \
-	$(OBJS)\basedll_dynarray.obj \
 	$(OBJS)\basedll_dynlib.obj \
 	$(OBJS)\basedll_dynload.obj \
 	$(OBJS)\basedll_encconv.obj \
@@ -866,7 +863,6 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_datetimefmt.obj \
 	$(OBJS)\baselib_datstrm.obj \
 	$(OBJS)\baselib_dircmn.obj \
-	$(OBJS)\baselib_dynarray.obj \
 	$(OBJS)\baselib_dynlib.obj \
 	$(OBJS)\baselib_dynload.obj \
 	$(OBJS)\baselib_encconv.obj \
@@ -7172,9 +7168,6 @@ $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -9721,9 +9714,6 @@ $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -12270,9 +12260,6 @@ $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -12618,9 +12605,6 @@ $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 

build/msw/wx_base.vcxproj

@@ -471,7 +471,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\src\common\dynarray.cpp" />
     <ClCompile Include="..\..\src\common\dynlib.cpp" />
     <ClCompile Include="..\..\src\common\dynload.cpp" />
     <ClCompile Include="..\..\src\common\encconv.cpp" />

build/msw/wx_base.vcxproj.filters

@@ -72,9 +72,6 @@
     <ClCompile Include="..\..\src\common\dummy.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\common\dynarray.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\common\dynlib.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>

build/msw/wx_vc7_base.vcproj

@@ -348,9 +348,6 @@
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\dynarray.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\common\dynlib.cpp">
 			</File>

build/msw/wx_vc8_base.vcproj

@@ -869,10 +869,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\dynarray.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\dynlib.cpp"
 				>

build/msw/wx_vc9_base.vcproj

@@ -865,10 +865,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\dynarray.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\dynlib.cpp"
 				>

build/osx/wxcocoa.xcodeproj/project.pbxproj

@@ -1028,9 +1028,6 @@
 		5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
 		5417332FE2DB3CD3A647B15E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
 		5417332FE2DB3CD3A647B15F /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
-		54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
-		54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
-		54A89D04FF953D55AE8DCCF2 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
 		5519BA1F2463308FAC4A0C9F /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
 		5519BA1F2463308FAC4A0CA0 /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
 		5519BA1F2463308FAC4A0CA1 /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
@@ -4490,7 +4487,6 @@
 		AC62806DE67F33E18C386D4F /* LexDMAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMAP.cxx; path = ../../src/stc/scintilla/lexers/LexDMAP.cxx; sourceTree = "<group>"; };
 		AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiaction_osx.cpp; path = ../../src/osx/uiaction_osx.cpp; sourceTree = "<group>"; };
 		AC8BB1AABB3D393EBA527060 /* intl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intl.cpp; path = ../../src/common/intl.cpp; sourceTree = "<group>"; };
-		ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynarray.cpp; path = ../../src/common/dynarray.cpp; sourceTree = "<group>"; };
 		ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ffile.cpp; path = ../../src/common/ffile.cpp; sourceTree = "<group>"; };
 		AE856D950B8C369EB0FE13BA /* datectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectlg.cpp; path = ../../src/generic/datectlg.cpp; sourceTree = "<group>"; };
 		AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = nonownedwnd.mm; path = ../../src/osx/cocoa/nonownedwnd.mm; sourceTree = "<group>"; };
@@ -5967,7 +5963,6 @@
 				864438709B363773B8C3382D /* datetimefmt.cpp */,
 				81B3DFBB73573FFDBD320334 /* datstrm.cpp */,
 				EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */,
-				ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */,
 				D272910EC35531E5B4D6E05B /* dynlib.cpp */,
 				93BA27DFFB023F2EBD6295E3 /* dynload.cpp */,
 				C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */,
@@ -7373,7 +7368,6 @@
 				1D726139C977341A97D0C933 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7EE /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423D1 /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF2 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF89 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4C1 /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F51 /* encconv.cpp in Sources */,
@@ -8082,7 +8076,6 @@
 				1D726139C977341A97D0C932 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7ED /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423D0 /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF88 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4C0 /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F50 /* encconv.cpp in Sources */,
@@ -9306,7 +9299,6 @@
 				1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */,

build/osx/wxiphone.xcodeproj/project.pbxproj

@@ -292,7 +292,6 @@
 		5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7925E38823563BCDB5565DCF /* treebkg.cpp */; };
 		539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F46EC1508C063C8395CE7A95 /* sstream.cpp */; };
 		5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
-		54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
 		5519BA1F2463308FAC4A0C9F /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
 		551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EDB48813110636DBA045BF3A /* LexPS.cxx */; };
 		552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */ = {isa = PBXBuildFile; fileRef = AAC12B4456E13F57BEA25A5E /* tif_swab.c */; };
@@ -1438,7 +1437,6 @@
 		AC62806DE67F33E18C386D4F /* LexDMAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMAP.cxx; path = ../../src/stc/scintilla/lexers/LexDMAP.cxx; sourceTree = "<group>"; };
 		AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiaction_osx.cpp; path = ../../src/osx/uiaction_osx.cpp; sourceTree = "<group>"; };
 		AC8BB1AABB3D393EBA527060 /* intl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intl.cpp; path = ../../src/common/intl.cpp; sourceTree = "<group>"; };
-		ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynarray.cpp; path = ../../src/common/dynarray.cpp; sourceTree = "<group>"; };
 		ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ffile.cpp; path = ../../src/common/ffile.cpp; sourceTree = "<group>"; };
 		AE856D950B8C369EB0FE13BA /* datectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectlg.cpp; path = ../../src/generic/datectlg.cpp; sourceTree = "<group>"; };
 		AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = nonownedwnd.mm; path = ../../src/osx/iphone/nonownedwnd.mm; sourceTree = "<group>"; };
@@ -2579,7 +2577,6 @@
 				864438709B363773B8C3382D /* datetimefmt.cpp */,
 				81B3DFBB73573FFDBD320334 /* datstrm.cpp */,
 				EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */,
-				ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */,
 				D272910EC35531E5B4D6E05B /* dynlib.cpp */,
 				93BA27DFFB023F2EBD6295E3 /* dynload.cpp */,
 				C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */,
@@ -2893,7 +2890,6 @@
 				1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */,

src/common/arrstr.cpp

@@ -55,7 +55,115 @@ wxArrayString::wxArrayString(size_t sz, const wxString* a)
     assign(a, a + sz);
 }
 
-#if !wxUSE_STD_CONTAINERS
+#if wxUSE_STD_CONTAINERS
+
+#include "wx/arrstr.h"
+
+#include "wx/beforestd.h"
+#include <functional>
+#include "wx/afterstd.h"
+
+// some compilers (Sun CC being the only known example) distinguish between
+// extern "C" functions and the functions with C++ linkage and ptr_fun and
+// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
+// this case, we need the wrappers below to make this work
+struct wxStringCmp
+{
+    typedef wxString first_argument_type;
+    typedef wxString second_argument_type;
+    typedef int result_type;
+
+    int operator()(const wxString& s1, const wxString& s2) const
+    {
+        return s1.compare(s2);
+    }
+};
+
+struct wxStringCmpNoCase
+{
+    typedef wxString first_argument_type;
+    typedef wxString second_argument_type;
+    typedef int result_type;
+
+    int operator()(const wxString& s1, const wxString& s2) const
+    {
+        return s1.CmpNoCase(s2);
+    }
+};
+
+int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
+{
+    wxArrayString::const_iterator it;
+
+    if (bCase)
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  wxStringCmp(), str)));
+    }
+    else // !bCase
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  wxStringCmpNoCase(), str)));
+    }
+
+    return it == end() ? wxNOT_FOUND : it - begin();
+}
+
+template<class F>
+class wxStringCompareLess
+{
+public:
+    wxStringCompareLess(F f) : m_f(f) { }
+    bool operator()(const wxString& s1, const wxString& s2)
+        { return m_f(s1, s2) < 0; }
+private:
+    F m_f;
+};
+
+template<class F>
+wxStringCompareLess<F> wxStringCompare(F f)
+{
+    return wxStringCompareLess<F>(f);
+}
+
+void wxArrayString::Sort(CompareFunction function)
+{
+    std::sort(begin(), end(), wxStringCompare(function));
+}
+
+void wxArrayString::Sort(bool reverseOrder)
+{
+    if (reverseOrder)
+    {
+        std::sort(begin(), end(), std::greater<wxString>());
+    }
+    else
+    {
+        std::sort(begin(), end());
+    }
+}
+
+int wxSortedArrayString::Index(const wxString& str,
+                               bool WXUNUSED_UNLESS_DEBUG(bCase),
+                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const
+{
+    wxASSERT_MSG( bCase && !bFromEnd,
+                  "search parameters ignored for sorted array" );
+
+    wxSortedArrayString::const_iterator
+        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));
+
+    if ( it == end() || str.Cmp(*it) != 0 )
+        return wxNOT_FOUND;
+
+    return it - begin();
+}
+
+#else // !wxUSE_STD_CONTAINERS
 
 #ifndef   ARRAY_DEFAULT_INITIAL_SIZE    // also defined in dynarray.h
 #define   ARRAY_DEFAULT_INITIAL_SIZE    (16)

src/common/descrip.mms

@@ -89,7 +89,6 @@ OBJECTS = \
 		docmdi.obj,\
 		docview.obj,\
 		dpycmn.obj,\
-		dynarray.obj,\
 		dynlib.obj,\
 		encconv.obj,\
 		event.obj,\
@@ -281,7 +280,6 @@ SOURCES = \
 		docmdi.cpp,\
 		docview.cpp,\
 		dpycmn.cpp,\
-		dynarray.cpp,\
 		dynlib.cpp,\
 		encconv.cpp,\
 		event.cpp,\
@@ -523,7 +521,6 @@ dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
 docmdi.obj : docmdi.cpp
 docview.obj : docview.cpp
-dynarray.obj : dynarray.cpp
 dynlib.obj : dynlib.cpp
 encconv.obj : encconv.cpp
 event.obj : event.cpp

src/common/dynarray.cpp

@@ -1,135 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dynarray.cpp
-// Purpose:     implementation of wxBaseArray class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     12.09.97
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// headers
-// ============================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include  "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/intl.h"
-#endif //WX_PRECOMP
-
-#if wxUSE_STD_CONTAINERS
-
-#include "wx/arrstr.h"
-
-#include "wx/beforestd.h"
-#include <functional>
-#include "wx/afterstd.h"
-
-// some compilers (Sun CC being the only known example) distinguish between
-// extern "C" functions and the functions with C++ linkage and ptr_fun and
-// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
-// this case, we need the wrappers below to make this work
-struct wxStringCmp
-{
-    typedef wxString first_argument_type;
-    typedef wxString second_argument_type;
-    typedef int result_type;
-
-    int operator()(const wxString& s1, const wxString& s2) const
-    {
-        return s1.compare(s2);
-    }
-};
-
-struct wxStringCmpNoCase
-{
-    typedef wxString first_argument_type;
-    typedef wxString second_argument_type;
-    typedef int result_type;
-
-    int operator()(const wxString& s1, const wxString& s2) const
-    {
-        return s1.CmpNoCase(s2);
-    }
-};
-
-int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
-{
-    wxArrayString::const_iterator it;
-
-    if (bCase)
-    {
-        it = std::find_if(begin(), end(),
-                          std::not1(
-                              std::bind2nd(
-                                  wxStringCmp(), str)));
-    }
-    else // !bCase
-    {
-        it = std::find_if(begin(), end(),
-                          std::not1(
-                              std::bind2nd(
-                                  wxStringCmpNoCase(), str)));
-    }
-
-    return it == end() ? wxNOT_FOUND : it - begin();
-}
-
-template<class F>
-class wxStringCompareLess
-{
-public:
-    wxStringCompareLess(F f) : m_f(f) { }
-    bool operator()(const wxString& s1, const wxString& s2)
-        { return m_f(s1, s2) < 0; }
-private:
-    F m_f;
-};
-
-template<class F>
-wxStringCompareLess<F> wxStringCompare(F f)
-{
-    return wxStringCompareLess<F>(f);
-}
-
-void wxArrayString::Sort(CompareFunction function)
-{
-    std::sort(begin(), end(), wxStringCompare(function));
-}
-
-void wxArrayString::Sort(bool reverseOrder)
-{
-    if (reverseOrder)
-    {
-        std::sort(begin(), end(), std::greater<wxString>());
-    }
-    else
-    {
-        std::sort(begin(), end());
-    }
-}
-
-int wxSortedArrayString::Index(const wxString& str,
-                               bool WXUNUSED_UNLESS_DEBUG(bCase),
-                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const
-{
-    wxASSERT_MSG( bCase && !bFromEnd,
-                  "search parameters ignored for sorted array" );
-
-    wxSortedArrayString::const_iterator
-        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));
-
-    if ( it == end() || str.Cmp(*it) != 0 )
-        return wxNOT_FOUND;
-
-    return it - begin();
-}
-
-#endif // wxUSE_STD_CONTAINERS