Move wxColourData and wxFontData into separate files.

This eliminates a linking dependency that would drag in the printing
code for any program that used wxColourDialog or wxFontDialog (which
is currently all of them, due to more link dependencies...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-01-07 05:26:57 +00:00
parent 807902f119
commit 081d8d96db
52 changed files with 668 additions and 322 deletions

View File

@@ -1801,6 +1801,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_clrpickercmn.obj \
$(OBJS)\monodll_colourcmn.obj \
$(OBJS)\monodll_colourdata.obj \
$(OBJS)\monodll_combocmn.obj \
$(OBJS)\monodll_cmdproc.obj \
$(OBJS)\monodll_cmndata.obj \
@@ -1828,6 +1829,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontpickercmn.obj \
$(OBJS)\monodll_fldlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontdata.obj \
$(OBJS)\monodll_graphicc.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
@@ -2060,6 +2062,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_clrpickercmn.obj \
$(OBJS)\monodll_colourcmn.obj \
$(OBJS)\monodll_colourdata.obj \
$(OBJS)\monodll_combocmn.obj \
$(OBJS)\monodll_cmdproc.obj \
$(OBJS)\monodll_cmndata.obj \
@@ -2087,6 +2090,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontpickercmn.obj \
$(OBJS)\monodll_fldlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontdata.obj \
$(OBJS)\monodll_graphicc.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
@@ -2551,6 +2555,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_clrpickercmn.obj \
$(OBJS)\monolib_colourcmn.obj \
$(OBJS)\monolib_colourdata.obj \
$(OBJS)\monolib_combocmn.obj \
$(OBJS)\monolib_cmdproc.obj \
$(OBJS)\monolib_cmndata.obj \
@@ -2578,6 +2583,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontpickercmn.obj \
$(OBJS)\monolib_fldlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontdata.obj \
$(OBJS)\monolib_graphicc.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
@@ -2810,6 +2816,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_clrpickercmn.obj \
$(OBJS)\monolib_colourcmn.obj \
$(OBJS)\monolib_colourdata.obj \
$(OBJS)\monolib_combocmn.obj \
$(OBJS)\monolib_cmdproc.obj \
$(OBJS)\monolib_cmndata.obj \
@@ -2837,6 +2844,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontpickercmn.obj \
$(OBJS)\monolib_fldlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontdata.obj \
$(OBJS)\monolib_graphicc.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
@@ -3189,6 +3197,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_clrpickercmn.obj \
$(OBJS)\coredll_colourcmn.obj \
$(OBJS)\coredll_colourdata.obj \
$(OBJS)\coredll_combocmn.obj \
$(OBJS)\coredll_cmdproc.obj \
$(OBJS)\coredll_cmndata.obj \
@@ -3216,6 +3225,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontpickercmn.obj \
$(OBJS)\coredll_fldlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontdata.obj \
$(OBJS)\coredll_graphicc.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
@@ -3448,6 +3458,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_clrpickercmn.obj \
$(OBJS)\coredll_colourcmn.obj \
$(OBJS)\coredll_colourdata.obj \
$(OBJS)\coredll_combocmn.obj \
$(OBJS)\coredll_cmdproc.obj \
$(OBJS)\coredll_cmndata.obj \
@@ -3475,6 +3486,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontpickercmn.obj \
$(OBJS)\coredll_fldlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontdata.obj \
$(OBJS)\coredll_graphicc.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
@@ -3716,6 +3728,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_clrpickercmn.obj \
$(OBJS)\corelib_colourcmn.obj \
$(OBJS)\corelib_colourdata.obj \
$(OBJS)\corelib_combocmn.obj \
$(OBJS)\corelib_cmdproc.obj \
$(OBJS)\corelib_cmndata.obj \
@@ -3743,6 +3756,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontpickercmn.obj \
$(OBJS)\corelib_fldlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontdata.obj \
$(OBJS)\corelib_graphicc.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
@@ -3975,6 +3989,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_clrpickercmn.obj \
$(OBJS)\corelib_colourcmn.obj \
$(OBJS)\corelib_colourdata.obj \
$(OBJS)\corelib_combocmn.obj \
$(OBJS)\corelib_cmdproc.obj \
$(OBJS)\corelib_cmndata.obj \
@@ -4002,6 +4017,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontpickercmn.obj \
$(OBJS)\corelib_fldlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontdata.obj \
$(OBJS)\corelib_graphicc.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
@@ -7292,6 +7308,11 @@ $(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -7427,6 +7448,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_graphicc.obj: ..\..\src\generic\graphicc.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp
@@ -9604,6 +9630,11 @@ $(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -9739,6 +9770,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp
@@ -11907,6 +11943,11 @@ $(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -12042,6 +12083,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp
@@ -13277,6 +13323,11 @@ $(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -13412,6 +13463,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp