Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dynarray.cpp source file

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2018-06-20 13:59:03 +02:00
parent 3e078d509c
commit abce91f967
17 changed files with 109 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/msw/makefile.bcc
View File

@@ -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

16
build/msw/makefile.gcc
View File

@@ -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) $<

16
build/msw/makefile.vc
View File

@@ -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

1
build/msw/wx_base.vcxproj
View File

@@ -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" />

3
build/msw/wx_base.vcxproj.filters
View File

@@ -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>

3
build/msw/wx_vc7_base.vcproj
View File

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

4
build/msw/wx_vc8_base.vcproj
View File

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

4
build/msw/wx_vc9_base.vcproj
View File

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