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

wxFontEnumerator::GetFacenames/Encodings() now return arrays and not pointers to them (patch 1483341)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-28 13:51:34 +00:00
parent 22757a804b
commit 6540132fa1
15 changed files with 252 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/bakefiles/files.bkl
View File

@@ -577,6 +577,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/fddlgcmn.cpp
src/common/fldlgcmn.cpp
src/common/fontcmn.cpp
src/common/fontenumcmn.cpp
src/common/fontmap.cpp
src/common/framecmn.cpp
src/common/gaugecmn.cpp

28
build/msw/makefile.bcc
View File

@@ -1282,6 +1282,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fddlgcmn.obj \
$(OBJS)\monodll_fldlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
@@ -1486,6 +1487,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fddlgcmn.obj \
$(OBJS)\monodll_fldlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
@@ -1831,6 +1833,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fddlgcmn.obj \
$(OBJS)\monolib_fldlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
@@ -2035,6 +2038,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fddlgcmn.obj \
$(OBJS)\monolib_fldlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
@@ -2313,6 +2317,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fddlgcmn.obj \
$(OBJS)\coredll_fldlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
@@ -2517,6 +2522,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fddlgcmn.obj \
$(OBJS)\coredll_fldlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
@@ -2724,6 +2730,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fddlgcmn.obj \
$(OBJS)\corelib_fldlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
@@ -2928,6 +2935,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fddlgcmn.obj \
$(OBJS)\corelib_fldlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
@@ -5410,6 +5418,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7207,6 +7220,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -9079,6 +9097,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -10258,6 +10281,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

28
build/msw/makefile.gcc
View File

@@ -1293,6 +1293,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fddlgcmn.o \
$(OBJS)\monodll_fldlgcmn.o \
$(OBJS)\monodll_fontcmn.o \
$(OBJS)\monodll_fontenumcmn.o \
$(OBJS)\monodll_fontmap.o \
$(OBJS)\monodll_framecmn.o \
$(OBJS)\monodll_gaugecmn.o \
@@ -1499,6 +1500,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fddlgcmn.o \
$(OBJS)\monodll_fldlgcmn.o \
$(OBJS)\monodll_fontcmn.o \
$(OBJS)\monodll_fontenumcmn.o \
$(OBJS)\monodll_fontmap.o \
$(OBJS)\monodll_framecmn.o \
$(OBJS)\monodll_gaugecmn.o \
@@ -1848,6 +1850,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fddlgcmn.o \
$(OBJS)\monolib_fldlgcmn.o \
$(OBJS)\monolib_fontcmn.o \
$(OBJS)\monolib_fontenumcmn.o \
$(OBJS)\monolib_fontmap.o \
$(OBJS)\monolib_framecmn.o \
$(OBJS)\monolib_gaugecmn.o \
@@ -2054,6 +2057,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fddlgcmn.o \
$(OBJS)\monolib_fldlgcmn.o \
$(OBJS)\monolib_fontcmn.o \
$(OBJS)\monolib_fontenumcmn.o \
$(OBJS)\monolib_fontmap.o \
$(OBJS)\monolib_framecmn.o \
$(OBJS)\monolib_gaugecmn.o \
@@ -2346,6 +2350,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fddlgcmn.o \
$(OBJS)\coredll_fldlgcmn.o \
$(OBJS)\coredll_fontcmn.o \
$(OBJS)\coredll_fontenumcmn.o \
$(OBJS)\coredll_fontmap.o \
$(OBJS)\coredll_framecmn.o \
$(OBJS)\coredll_gaugecmn.o \
@@ -2552,6 +2557,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fddlgcmn.o \
$(OBJS)\coredll_fldlgcmn.o \
$(OBJS)\coredll_fontcmn.o \
$(OBJS)\coredll_fontenumcmn.o \
$(OBJS)\coredll_fontmap.o \
$(OBJS)\coredll_framecmn.o \
$(OBJS)\coredll_gaugecmn.o \
@@ -2765,6 +2771,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fddlgcmn.o \
$(OBJS)\corelib_fldlgcmn.o \
$(OBJS)\corelib_fontcmn.o \
$(OBJS)\corelib_fontenumcmn.o \
$(OBJS)\corelib_fontmap.o \
$(OBJS)\corelib_framecmn.o \
$(OBJS)\corelib_gaugecmn.o \
@@ -2971,6 +2978,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fddlgcmn.o \
$(OBJS)\corelib_fldlgcmn.o \
$(OBJS)\corelib_fontcmn.o \
$(OBJS)\corelib_fontenumcmn.o \
$(OBJS)\corelib_fontmap.o \
$(OBJS)\corelib_framecmn.o \
$(OBJS)\corelib_gaugecmn.o \
@@ -5618,6 +5626,11 @@ $(OBJS)\monodll_fontcmn.o: ../../src/common/fontcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_fontenumcmn.o: ../../src/common/fontenumcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7519,6 +7532,11 @@ $(OBJS)\monolib_fontcmn.o: ../../src/common/fontcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_fontenumcmn.o: ../../src/common/fontenumcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -9495,6 +9513,11 @@ $(OBJS)\coredll_fontcmn.o: ../../src/common/fontcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_fontenumcmn.o: ../../src/common/fontenumcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10778,6 +10801,11 @@ $(OBJS)\corelib_fontcmn.o: ../../src/common/fontcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_fontenumcmn.o: ../../src/common/fontenumcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

28
build/msw/makefile.vc
View File

@@ -1441,6 +1441,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fddlgcmn.obj \
$(OBJS)\monodll_fldlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
@@ -1645,6 +1646,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fddlgcmn.obj \
$(OBJS)\monodll_fldlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
@@ -1996,6 +1998,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fddlgcmn.obj \
$(OBJS)\monolib_fldlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
@@ -2200,6 +2203,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fddlgcmn.obj \
$(OBJS)\monolib_fldlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
@@ -2508,6 +2512,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fddlgcmn.obj \
$(OBJS)\coredll_fldlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
@@ -2712,6 +2717,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fddlgcmn.obj \
$(OBJS)\coredll_fldlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
@@ -2925,6 +2931,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fddlgcmn.obj \
$(OBJS)\corelib_fldlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
@@ -3129,6 +3136,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fddlgcmn.obj \
$(OBJS)\corelib_fldlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
@@ -5719,6 +5727,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7516,6 +7529,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -9388,6 +9406,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -10567,6 +10590,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

28
build/msw/makefile.wat
View File

@@ -310,6 +310,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_fddlgcmn.obj &
$(OBJS)\monodll_fldlgcmn.obj &
$(OBJS)\monodll_fontcmn.obj &
$(OBJS)\monodll_fontenumcmn.obj &
$(OBJS)\monodll_fontmap.obj &
$(OBJS)\monodll_framecmn.obj &
$(OBJS)\monodll_gaugecmn.obj &
@@ -516,6 +517,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_fddlgcmn.obj &
$(OBJS)\monodll_fldlgcmn.obj &
$(OBJS)\monodll_fontcmn.obj &
$(OBJS)\monodll_fontenumcmn.obj &
$(OBJS)\monodll_fontmap.obj &
$(OBJS)\monodll_framecmn.obj &
$(OBJS)\monodll_gaugecmn.obj &
@@ -869,6 +871,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_fddlgcmn.obj &
$(OBJS)\monolib_fldlgcmn.obj &
$(OBJS)\monolib_fontcmn.obj &
$(OBJS)\monolib_fontenumcmn.obj &
$(OBJS)\monolib_fontmap.obj &
$(OBJS)\monolib_framecmn.obj &
$(OBJS)\monolib_gaugecmn.obj &
@@ -1075,6 +1078,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_fddlgcmn.obj &
$(OBJS)\monolib_fldlgcmn.obj &
$(OBJS)\monolib_fontcmn.obj &
$(OBJS)\monolib_fontenumcmn.obj &
$(OBJS)\monolib_fontmap.obj &
$(OBJS)\monolib_framecmn.obj &
$(OBJS)\monolib_gaugecmn.obj &
@@ -1374,6 +1378,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_fddlgcmn.obj &
$(OBJS)\coredll_fldlgcmn.obj &
$(OBJS)\coredll_fontcmn.obj &
$(OBJS)\coredll_fontenumcmn.obj &
$(OBJS)\coredll_fontmap.obj &
$(OBJS)\coredll_framecmn.obj &
$(OBJS)\coredll_gaugecmn.obj &
@@ -1580,6 +1585,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_fddlgcmn.obj &
$(OBJS)\coredll_fldlgcmn.obj &
$(OBJS)\coredll_fontcmn.obj &
$(OBJS)\coredll_fontenumcmn.obj &
$(OBJS)\coredll_fontmap.obj &
$(OBJS)\coredll_framecmn.obj &
$(OBJS)\coredll_gaugecmn.obj &
@@ -1795,6 +1801,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_fddlgcmn.obj &
$(OBJS)\corelib_fldlgcmn.obj &
$(OBJS)\corelib_fontcmn.obj &
$(OBJS)\corelib_fontenumcmn.obj &
$(OBJS)\corelib_fontmap.obj &
$(OBJS)\corelib_framecmn.obj &
$(OBJS)\corelib_gaugecmn.obj &
@@ -2001,6 +2008,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_fddlgcmn.obj &
$(OBJS)\corelib_fldlgcmn.obj &
$(OBJS)\corelib_fontcmn.obj &
$(OBJS)\corelib_fontenumcmn.obj &
$(OBJS)\corelib_fontmap.obj &
$(OBJS)\corelib_framecmn.obj &
$(OBJS)\corelib_gaugecmn.obj &
@@ -5818,6 +5826,11 @@ $(OBJS)\monodll_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7719,6 +7732,11 @@ $(OBJS)\monolib_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -9695,6 +9713,11 @@ $(OBJS)\coredll_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -10978,6 +11001,11 @@ $(OBJS)\corelib_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

4
build/msw/wx_core.dsp
View File

@@ -576,6 +576,10 @@ SOURCE=..\..\src\common\fontcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\fontenumcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\fontmap.cpp
# End Source File
# Begin Source File