wx/cmdproc.h \
wx/colordlg.h \
wx/colour.h \
+ wx/colourdata.h \
wx/cshelp.h \
wx/dataobj.h \
wx/dcmirror.h \
wx/fontpicker.h \
wx/fmappriv.h \
wx/font.h \
+ wx/fontdata.h \
wx/fontdlg.h \
wx/fontenum.h \
wx/fontutil.h \
monodll_clipcmn.o \
monodll_clrpickercmn.o \
monodll_colourcmn.o \
+ monodll_colourdata.o \
monodll_combocmn.o \
monodll_cmdproc.o \
monodll_cmndata.o \
monodll_fontpickercmn.o \
monodll_fldlgcmn.o \
monodll_fontcmn.o \
+ monodll_fontdata.o \
monodll_graphicc.o \
monodll_fontenumcmn.o \
monodll_fontmap.o \
monodll_clipcmn.o \
monodll_clrpickercmn.o \
monodll_colourcmn.o \
+ monodll_colourdata.o \
monodll_combocmn.o \
monodll_cmdproc.o \
monodll_cmndata.o \
monodll_fontpickercmn.o \
monodll_fldlgcmn.o \
monodll_fontcmn.o \
+ monodll_fontdata.o \
monodll_graphicc.o \
monodll_fontenumcmn.o \
monodll_fontmap.o \
monolib_clipcmn.o \
monolib_clrpickercmn.o \
monolib_colourcmn.o \
+ monolib_colourdata.o \
monolib_combocmn.o \
monolib_cmdproc.o \
monolib_cmndata.o \
monolib_fontpickercmn.o \
monolib_fldlgcmn.o \
monolib_fontcmn.o \
+ monolib_fontdata.o \
monolib_graphicc.o \
monolib_fontenumcmn.o \
monolib_fontmap.o \
monolib_clipcmn.o \
monolib_clrpickercmn.o \
monolib_colourcmn.o \
+ monolib_colourdata.o \
monolib_combocmn.o \
monolib_cmdproc.o \
monolib_cmndata.o \
monolib_fontpickercmn.o \
monolib_fldlgcmn.o \
monolib_fontcmn.o \
+ monolib_fontdata.o \
monolib_graphicc.o \
monolib_fontenumcmn.o \
monolib_fontmap.o \
coredll_clipcmn.o \
coredll_clrpickercmn.o \
coredll_colourcmn.o \
+ coredll_colourdata.o \
coredll_combocmn.o \
coredll_cmdproc.o \
coredll_cmndata.o \
coredll_fontpickercmn.o \
coredll_fldlgcmn.o \
coredll_fontcmn.o \
+ coredll_fontdata.o \
coredll_graphicc.o \
coredll_fontenumcmn.o \
coredll_fontmap.o \
coredll_clipcmn.o \
coredll_clrpickercmn.o \
coredll_colourcmn.o \
+ coredll_colourdata.o \
coredll_combocmn.o \
coredll_cmdproc.o \
coredll_cmndata.o \
coredll_fontpickercmn.o \
coredll_fldlgcmn.o \
coredll_fontcmn.o \
+ coredll_fontdata.o \
coredll_graphicc.o \
coredll_fontenumcmn.o \
coredll_fontmap.o \
corelib_clipcmn.o \
corelib_clrpickercmn.o \
corelib_colourcmn.o \
+ corelib_colourdata.o \
corelib_combocmn.o \
corelib_cmdproc.o \
corelib_cmndata.o \
corelib_fontpickercmn.o \
corelib_fldlgcmn.o \
corelib_fontcmn.o \
+ corelib_fontdata.o \
corelib_graphicc.o \
corelib_fontenumcmn.o \
corelib_fontmap.o \
corelib_clipcmn.o \
corelib_clrpickercmn.o \
corelib_colourcmn.o \
+ corelib_colourdata.o \
corelib_combocmn.o \
corelib_cmdproc.o \
corelib_cmndata.o \
corelib_fontpickercmn.o \
corelib_fldlgcmn.o \
corelib_fontcmn.o \
+ corelib_fontdata.o \
corelib_graphicc.o \
corelib_fontenumcmn.o \
corelib_fontmap.o \
@COND_USE_GUI_1@monodll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+@COND_USE_GUI_1@monodll_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
@COND_USE_GUI_1@monodll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
@COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+@COND_USE_GUI_1@monodll_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
@COND_USE_GUI_1@monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
@COND_USE_GUI_1@monolib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+@COND_USE_GUI_1@monolib_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
@COND_USE_GUI_1@monolib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
@COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+@COND_USE_GUI_1@monolib_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
@COND_USE_GUI_1@monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
@COND_USE_GUI_1@coredll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+@COND_USE_GUI_1@coredll_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
@COND_USE_GUI_1@coredll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
@COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+@COND_USE_GUI_1@coredll_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
@COND_USE_GUI_1@coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
@COND_USE_GUI_1@corelib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+@COND_USE_GUI_1@corelib_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
@COND_USE_GUI_1@corelib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
@COND_USE_GUI_1@corelib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+@COND_USE_GUI_1@corelib_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
@COND_USE_GUI_1@corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
src/common/clipcmn.cpp
src/common/clrpickercmn.cpp
src/common/colourcmn.cpp
+ src/common/colourdata.cpp
src/common/combocmn.cpp
src/common/cmdproc.cpp
src/common/cmndata.cpp
src/common/fontpickercmn.cpp
src/common/fldlgcmn.cpp
src/common/fontcmn.cpp
+ src/common/fontdata.cpp
src/generic/graphicc.cpp
src/common/fontenumcmn.cpp
src/common/fontmap.cpp
wx/cmdproc.h
wx/colordlg.h
wx/colour.h
+ wx/colourdata.h
wx/cshelp.h
wx/dataobj.h
wx/dcmirror.h
wx/fontpicker.h
wx/fmappriv.h
wx/font.h
+ wx/fontdata.h
wx/fontdlg.h
wx/fontenum.h
wx/fontutil.h
$(OBJS)\monodll_clipcmn.obj \\r
$(OBJS)\monodll_clrpickercmn.obj \\r
$(OBJS)\monodll_colourcmn.obj \\r
+ $(OBJS)\monodll_colourdata.obj \\r
$(OBJS)\monodll_combocmn.obj \\r
$(OBJS)\monodll_cmdproc.obj \\r
$(OBJS)\monodll_cmndata.obj \\r
$(OBJS)\monodll_fontpickercmn.obj \\r
$(OBJS)\monodll_fldlgcmn.obj \\r
$(OBJS)\monodll_fontcmn.obj \\r
+ $(OBJS)\monodll_fontdata.obj \\r
$(OBJS)\monodll_graphicc.obj \\r
$(OBJS)\monodll_fontenumcmn.obj \\r
$(OBJS)\monodll_fontmap.obj \\r
$(OBJS)\monodll_clipcmn.obj \\r
$(OBJS)\monodll_clrpickercmn.obj \\r
$(OBJS)\monodll_colourcmn.obj \\r
+ $(OBJS)\monodll_colourdata.obj \\r
$(OBJS)\monodll_combocmn.obj \\r
$(OBJS)\monodll_cmdproc.obj \\r
$(OBJS)\monodll_cmndata.obj \\r
$(OBJS)\monodll_fontpickercmn.obj \\r
$(OBJS)\monodll_fldlgcmn.obj \\r
$(OBJS)\monodll_fontcmn.obj \\r
+ $(OBJS)\monodll_fontdata.obj \\r
$(OBJS)\monodll_graphicc.obj \\r
$(OBJS)\monodll_fontenumcmn.obj \\r
$(OBJS)\monodll_fontmap.obj \\r
$(OBJS)\monolib_clipcmn.obj \\r
$(OBJS)\monolib_clrpickercmn.obj \\r
$(OBJS)\monolib_colourcmn.obj \\r
+ $(OBJS)\monolib_colourdata.obj \\r
$(OBJS)\monolib_combocmn.obj \\r
$(OBJS)\monolib_cmdproc.obj \\r
$(OBJS)\monolib_cmndata.obj \\r
$(OBJS)\monolib_fontpickercmn.obj \\r
$(OBJS)\monolib_fldlgcmn.obj \\r
$(OBJS)\monolib_fontcmn.obj \\r
+ $(OBJS)\monolib_fontdata.obj \\r
$(OBJS)\monolib_graphicc.obj \\r
$(OBJS)\monolib_fontenumcmn.obj \\r
$(OBJS)\monolib_fontmap.obj \\r
$(OBJS)\monolib_clipcmn.obj \\r
$(OBJS)\monolib_clrpickercmn.obj \\r
$(OBJS)\monolib_colourcmn.obj \\r
+ $(OBJS)\monolib_colourdata.obj \\r
$(OBJS)\monolib_combocmn.obj \\r
$(OBJS)\monolib_cmdproc.obj \\r
$(OBJS)\monolib_cmndata.obj \\r
$(OBJS)\monolib_fontpickercmn.obj \\r
$(OBJS)\monolib_fldlgcmn.obj \\r
$(OBJS)\monolib_fontcmn.obj \\r
+ $(OBJS)\monolib_fontdata.obj \\r
$(OBJS)\monolib_graphicc.obj \\r
$(OBJS)\monolib_fontenumcmn.obj \\r
$(OBJS)\monolib_fontmap.obj \\r
$(OBJS)\coredll_clipcmn.obj \\r
$(OBJS)\coredll_clrpickercmn.obj \\r
$(OBJS)\coredll_colourcmn.obj \\r
+ $(OBJS)\coredll_colourdata.obj \\r
$(OBJS)\coredll_combocmn.obj \\r
$(OBJS)\coredll_cmdproc.obj \\r
$(OBJS)\coredll_cmndata.obj \\r
$(OBJS)\coredll_fontpickercmn.obj \\r
$(OBJS)\coredll_fldlgcmn.obj \\r
$(OBJS)\coredll_fontcmn.obj \\r
+ $(OBJS)\coredll_fontdata.obj \\r
$(OBJS)\coredll_graphicc.obj \\r
$(OBJS)\coredll_fontenumcmn.obj \\r
$(OBJS)\coredll_fontmap.obj \\r
$(OBJS)\coredll_clipcmn.obj \\r
$(OBJS)\coredll_clrpickercmn.obj \\r
$(OBJS)\coredll_colourcmn.obj \\r
+ $(OBJS)\coredll_colourdata.obj \\r
$(OBJS)\coredll_combocmn.obj \\r
$(OBJS)\coredll_cmdproc.obj \\r
$(OBJS)\coredll_cmndata.obj \\r
$(OBJS)\coredll_fontpickercmn.obj \\r
$(OBJS)\coredll_fldlgcmn.obj \\r
$(OBJS)\coredll_fontcmn.obj \\r
+ $(OBJS)\coredll_fontdata.obj \\r
$(OBJS)\coredll_graphicc.obj \\r
$(OBJS)\coredll_fontenumcmn.obj \\r
$(OBJS)\coredll_fontmap.obj \\r
$(OBJS)\corelib_clipcmn.obj \\r
$(OBJS)\corelib_clrpickercmn.obj \\r
$(OBJS)\corelib_colourcmn.obj \\r
+ $(OBJS)\corelib_colourdata.obj \\r
$(OBJS)\corelib_combocmn.obj \\r
$(OBJS)\corelib_cmdproc.obj \\r
$(OBJS)\corelib_cmndata.obj \\r
$(OBJS)\corelib_fontpickercmn.obj \\r
$(OBJS)\corelib_fldlgcmn.obj \\r
$(OBJS)\corelib_fontcmn.obj \\r
+ $(OBJS)\corelib_fontdata.obj \\r
$(OBJS)\corelib_graphicc.obj \\r
$(OBJS)\corelib_fontenumcmn.obj \\r
$(OBJS)\corelib_fontmap.obj \\r
$(OBJS)\corelib_clipcmn.obj \\r
$(OBJS)\corelib_clrpickercmn.obj \\r
$(OBJS)\corelib_colourcmn.obj \\r
+ $(OBJS)\corelib_colourdata.obj \\r
$(OBJS)\corelib_combocmn.obj \\r
$(OBJS)\corelib_cmdproc.obj \\r
$(OBJS)\corelib_cmndata.obj \\r
$(OBJS)\corelib_fontpickercmn.obj \\r
$(OBJS)\corelib_fldlgcmn.obj \\r
$(OBJS)\corelib_fontcmn.obj \\r
+ $(OBJS)\corelib_fontdata.obj \\r
$(OBJS)\corelib_graphicc.obj \\r
$(OBJS)\corelib_fontenumcmn.obj \\r
$(OBJS)\corelib_fontmap.obj \\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(OBJS)\monodll_clipcmn.o \\r
$(OBJS)\monodll_clrpickercmn.o \\r
$(OBJS)\monodll_colourcmn.o \\r
+ $(OBJS)\monodll_colourdata.o \\r
$(OBJS)\monodll_combocmn.o \\r
$(OBJS)\monodll_cmdproc.o \\r
$(OBJS)\monodll_cmndata.o \\r
$(OBJS)\monodll_fontpickercmn.o \\r
$(OBJS)\monodll_fldlgcmn.o \\r
$(OBJS)\monodll_fontcmn.o \\r
+ $(OBJS)\monodll_fontdata.o \\r
$(OBJS)\monodll_graphicc.o \\r
$(OBJS)\monodll_fontenumcmn.o \\r
$(OBJS)\monodll_fontmap.o \\r
$(OBJS)\monodll_clipcmn.o \\r
$(OBJS)\monodll_clrpickercmn.o \\r
$(OBJS)\monodll_colourcmn.o \\r
+ $(OBJS)\monodll_colourdata.o \\r
$(OBJS)\monodll_combocmn.o \\r
$(OBJS)\monodll_cmdproc.o \\r
$(OBJS)\monodll_cmndata.o \\r
$(OBJS)\monodll_fontpickercmn.o \\r
$(OBJS)\monodll_fldlgcmn.o \\r
$(OBJS)\monodll_fontcmn.o \\r
+ $(OBJS)\monodll_fontdata.o \\r
$(OBJS)\monodll_graphicc.o \\r
$(OBJS)\monodll_fontenumcmn.o \\r
$(OBJS)\monodll_fontmap.o \\r
$(OBJS)\monolib_clipcmn.o \\r
$(OBJS)\monolib_clrpickercmn.o \\r
$(OBJS)\monolib_colourcmn.o \\r
+ $(OBJS)\monolib_colourdata.o \\r
$(OBJS)\monolib_combocmn.o \\r
$(OBJS)\monolib_cmdproc.o \\r
$(OBJS)\monolib_cmndata.o \\r
$(OBJS)\monolib_fontpickercmn.o \\r
$(OBJS)\monolib_fldlgcmn.o \\r
$(OBJS)\monolib_fontcmn.o \\r
+ $(OBJS)\monolib_fontdata.o \\r
$(OBJS)\monolib_graphicc.o \\r
$(OBJS)\monolib_fontenumcmn.o \\r
$(OBJS)\monolib_fontmap.o \\r
$(OBJS)\monolib_clipcmn.o \\r
$(OBJS)\monolib_clrpickercmn.o \\r
$(OBJS)\monolib_colourcmn.o \\r
+ $(OBJS)\monolib_colourdata.o \\r
$(OBJS)\monolib_combocmn.o \\r
$(OBJS)\monolib_cmdproc.o \\r
$(OBJS)\monolib_cmndata.o \\r
$(OBJS)\monolib_fontpickercmn.o \\r
$(OBJS)\monolib_fldlgcmn.o \\r
$(OBJS)\monolib_fontcmn.o \\r
+ $(OBJS)\monolib_fontdata.o \\r
$(OBJS)\monolib_graphicc.o \\r
$(OBJS)\monolib_fontenumcmn.o \\r
$(OBJS)\monolib_fontmap.o \\r
$(OBJS)\coredll_clipcmn.o \\r
$(OBJS)\coredll_clrpickercmn.o \\r
$(OBJS)\coredll_colourcmn.o \\r
+ $(OBJS)\coredll_colourdata.o \\r
$(OBJS)\coredll_combocmn.o \\r
$(OBJS)\coredll_cmdproc.o \\r
$(OBJS)\coredll_cmndata.o \\r
$(OBJS)\coredll_fontpickercmn.o \\r
$(OBJS)\coredll_fldlgcmn.o \\r
$(OBJS)\coredll_fontcmn.o \\r
+ $(OBJS)\coredll_fontdata.o \\r
$(OBJS)\coredll_graphicc.o \\r
$(OBJS)\coredll_fontenumcmn.o \\r
$(OBJS)\coredll_fontmap.o \\r
$(OBJS)\coredll_clipcmn.o \\r
$(OBJS)\coredll_clrpickercmn.o \\r
$(OBJS)\coredll_colourcmn.o \\r
+ $(OBJS)\coredll_colourdata.o \\r
$(OBJS)\coredll_combocmn.o \\r
$(OBJS)\coredll_cmdproc.o \\r
$(OBJS)\coredll_cmndata.o \\r
$(OBJS)\coredll_fontpickercmn.o \\r
$(OBJS)\coredll_fldlgcmn.o \\r
$(OBJS)\coredll_fontcmn.o \\r
+ $(OBJS)\coredll_fontdata.o \\r
$(OBJS)\coredll_graphicc.o \\r
$(OBJS)\coredll_fontenumcmn.o \\r
$(OBJS)\coredll_fontmap.o \\r
$(OBJS)\corelib_clipcmn.o \\r
$(OBJS)\corelib_clrpickercmn.o \\r
$(OBJS)\corelib_colourcmn.o \\r
+ $(OBJS)\corelib_colourdata.o \\r
$(OBJS)\corelib_combocmn.o \\r
$(OBJS)\corelib_cmdproc.o \\r
$(OBJS)\corelib_cmndata.o \\r
$(OBJS)\corelib_fontpickercmn.o \\r
$(OBJS)\corelib_fldlgcmn.o \\r
$(OBJS)\corelib_fontcmn.o \\r
+ $(OBJS)\corelib_fontdata.o \\r
$(OBJS)\corelib_graphicc.o \\r
$(OBJS)\corelib_fontenumcmn.o \\r
$(OBJS)\corelib_fontmap.o \\r
$(OBJS)\corelib_clipcmn.o \\r
$(OBJS)\corelib_clrpickercmn.o \\r
$(OBJS)\corelib_colourcmn.o \\r
+ $(OBJS)\corelib_colourdata.o \\r
$(OBJS)\corelib_combocmn.o \\r
$(OBJS)\corelib_cmdproc.o \\r
$(OBJS)\corelib_cmndata.o \\r
$(OBJS)\corelib_fontpickercmn.o \\r
$(OBJS)\corelib_fldlgcmn.o \\r
$(OBJS)\corelib_fontcmn.o \\r
+ $(OBJS)\corelib_fontdata.o \\r
$(OBJS)\corelib_graphicc.o \\r
$(OBJS)\corelib_fontenumcmn.o \\r
$(OBJS)\corelib_fontmap.o \\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_colourdata.o: ../../src/common/colourdata.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_combocmn.o: ../../src/common/combocmn.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_fontdata.o: ../../src/common/fontdata.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_graphicc.o: ../../src/generic/graphicc.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_colourdata.o: ../../src/common/colourdata.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_combocmn.o: ../../src/common/combocmn.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_fontdata.o: ../../src/common/fontdata.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_graphicc.o: ../../src/generic/graphicc.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_colourdata.o: ../../src/common/colourdata.cpp\r
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\coredll_combocmn.o: ../../src/common/combocmn.cpp\r
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_fontdata.o: ../../src/common/fontdata.cpp\r
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\coredll_graphicc.o: ../../src/generic/graphicc.cpp\r
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_colourdata.o: ../../src/common/colourdata.cpp\r
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\corelib_combocmn.o: ../../src/common/combocmn.cpp\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_fontdata.o: ../../src/common/fontdata.cpp\r
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\corelib_graphicc.o: ../../src/generic/graphicc.cpp\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
$(OBJS)\monodll_clipcmn.obj \\r
$(OBJS)\monodll_clrpickercmn.obj \\r
$(OBJS)\monodll_colourcmn.obj \\r
+ $(OBJS)\monodll_colourdata.obj \\r
$(OBJS)\monodll_combocmn.obj \\r
$(OBJS)\monodll_cmdproc.obj \\r
$(OBJS)\monodll_cmndata.obj \\r
$(OBJS)\monodll_fontpickercmn.obj \\r
$(OBJS)\monodll_fldlgcmn.obj \\r
$(OBJS)\monodll_fontcmn.obj \\r
+ $(OBJS)\monodll_fontdata.obj \\r
$(OBJS)\monodll_graphicc.obj \\r
$(OBJS)\monodll_fontenumcmn.obj \\r
$(OBJS)\monodll_fontmap.obj \\r
$(OBJS)\monodll_clipcmn.obj \\r
$(OBJS)\monodll_clrpickercmn.obj \\r
$(OBJS)\monodll_colourcmn.obj \\r
+ $(OBJS)\monodll_colourdata.obj \\r
$(OBJS)\monodll_combocmn.obj \\r
$(OBJS)\monodll_cmdproc.obj \\r
$(OBJS)\monodll_cmndata.obj \\r
$(OBJS)\monodll_fontpickercmn.obj \\r
$(OBJS)\monodll_fldlgcmn.obj \\r
$(OBJS)\monodll_fontcmn.obj \\r
+ $(OBJS)\monodll_fontdata.obj \\r
$(OBJS)\monodll_graphicc.obj \\r
$(OBJS)\monodll_fontenumcmn.obj \\r
$(OBJS)\monodll_fontmap.obj \\r
$(OBJS)\monolib_clipcmn.obj \\r
$(OBJS)\monolib_clrpickercmn.obj \\r
$(OBJS)\monolib_colourcmn.obj \\r
+ $(OBJS)\monolib_colourdata.obj \\r
$(OBJS)\monolib_combocmn.obj \\r
$(OBJS)\monolib_cmdproc.obj \\r
$(OBJS)\monolib_cmndata.obj \\r
$(OBJS)\monolib_fontpickercmn.obj \\r
$(OBJS)\monolib_fldlgcmn.obj \\r
$(OBJS)\monolib_fontcmn.obj \\r
+ $(OBJS)\monolib_fontdata.obj \\r
$(OBJS)\monolib_graphicc.obj \\r
$(OBJS)\monolib_fontenumcmn.obj \\r
$(OBJS)\monolib_fontmap.obj \\r
$(OBJS)\monolib_clipcmn.obj \\r
$(OBJS)\monolib_clrpickercmn.obj \\r
$(OBJS)\monolib_colourcmn.obj \\r
+ $(OBJS)\monolib_colourdata.obj \\r
$(OBJS)\monolib_combocmn.obj \\r
$(OBJS)\monolib_cmdproc.obj \\r
$(OBJS)\monolib_cmndata.obj \\r
$(OBJS)\monolib_fontpickercmn.obj \\r
$(OBJS)\monolib_fldlgcmn.obj \\r
$(OBJS)\monolib_fontcmn.obj \\r
+ $(OBJS)\monolib_fontdata.obj \\r
$(OBJS)\monolib_graphicc.obj \\r
$(OBJS)\monolib_fontenumcmn.obj \\r
$(OBJS)\monolib_fontmap.obj \\r
$(OBJS)\coredll_clipcmn.obj \\r
$(OBJS)\coredll_clrpickercmn.obj \\r
$(OBJS)\coredll_colourcmn.obj \\r
+ $(OBJS)\coredll_colourdata.obj \\r
$(OBJS)\coredll_combocmn.obj \\r
$(OBJS)\coredll_cmdproc.obj \\r
$(OBJS)\coredll_cmndata.obj \\r
$(OBJS)\coredll_fontpickercmn.obj \\r
$(OBJS)\coredll_fldlgcmn.obj \\r
$(OBJS)\coredll_fontcmn.obj \\r
+ $(OBJS)\coredll_fontdata.obj \\r
$(OBJS)\coredll_graphicc.obj \\r
$(OBJS)\coredll_fontenumcmn.obj \\r
$(OBJS)\coredll_fontmap.obj \\r
$(OBJS)\coredll_clipcmn.obj \\r
$(OBJS)\coredll_clrpickercmn.obj \\r
$(OBJS)\coredll_colourcmn.obj \\r
+ $(OBJS)\coredll_colourdata.obj \\r
$(OBJS)\coredll_combocmn.obj \\r
$(OBJS)\coredll_cmdproc.obj \\r
$(OBJS)\coredll_cmndata.obj \\r
$(OBJS)\coredll_fontpickercmn.obj \\r
$(OBJS)\coredll_fldlgcmn.obj \\r
$(OBJS)\coredll_fontcmn.obj \\r
+ $(OBJS)\coredll_fontdata.obj \\r
$(OBJS)\coredll_graphicc.obj \\r
$(OBJS)\coredll_fontenumcmn.obj \\r
$(OBJS)\coredll_fontmap.obj \\r
$(OBJS)\corelib_clipcmn.obj \\r
$(OBJS)\corelib_clrpickercmn.obj \\r
$(OBJS)\corelib_colourcmn.obj \\r
+ $(OBJS)\corelib_colourdata.obj \\r
$(OBJS)\corelib_combocmn.obj \\r
$(OBJS)\corelib_cmdproc.obj \\r
$(OBJS)\corelib_cmndata.obj \\r
$(OBJS)\corelib_fontpickercmn.obj \\r
$(OBJS)\corelib_fldlgcmn.obj \\r
$(OBJS)\corelib_fontcmn.obj \\r
+ $(OBJS)\corelib_fontdata.obj \\r
$(OBJS)\corelib_graphicc.obj \\r
$(OBJS)\corelib_fontenumcmn.obj \\r
$(OBJS)\corelib_fontmap.obj \\r
$(OBJS)\corelib_clipcmn.obj \\r
$(OBJS)\corelib_clrpickercmn.obj \\r
$(OBJS)\corelib_colourcmn.obj \\r
+ $(OBJS)\corelib_colourdata.obj \\r
$(OBJS)\corelib_combocmn.obj \\r
$(OBJS)\corelib_cmdproc.obj \\r
$(OBJS)\corelib_cmndata.obj \\r
$(OBJS)\corelib_fontpickercmn.obj \\r
$(OBJS)\corelib_fldlgcmn.obj \\r
$(OBJS)\corelib_fontcmn.obj \\r
+ $(OBJS)\corelib_fontdata.obj \\r
$(OBJS)\corelib_graphicc.obj \\r
$(OBJS)\corelib_fontenumcmn.obj \\r
$(OBJS)\corelib_fontmap.obj \\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
$(OBJS)\monodll_clipcmn.obj &\r
$(OBJS)\monodll_clrpickercmn.obj &\r
$(OBJS)\monodll_colourcmn.obj &\r
+ $(OBJS)\monodll_colourdata.obj &\r
$(OBJS)\monodll_combocmn.obj &\r
$(OBJS)\monodll_cmdproc.obj &\r
$(OBJS)\monodll_cmndata.obj &\r
$(OBJS)\monodll_fontpickercmn.obj &\r
$(OBJS)\monodll_fldlgcmn.obj &\r
$(OBJS)\monodll_fontcmn.obj &\r
+ $(OBJS)\monodll_fontdata.obj &\r
$(OBJS)\monodll_graphicc.obj &\r
$(OBJS)\monodll_fontenumcmn.obj &\r
$(OBJS)\monodll_fontmap.obj &\r
$(OBJS)\monodll_clipcmn.obj &\r
$(OBJS)\monodll_clrpickercmn.obj &\r
$(OBJS)\monodll_colourcmn.obj &\r
+ $(OBJS)\monodll_colourdata.obj &\r
$(OBJS)\monodll_combocmn.obj &\r
$(OBJS)\monodll_cmdproc.obj &\r
$(OBJS)\monodll_cmndata.obj &\r
$(OBJS)\monodll_fontpickercmn.obj &\r
$(OBJS)\monodll_fldlgcmn.obj &\r
$(OBJS)\monodll_fontcmn.obj &\r
+ $(OBJS)\monodll_fontdata.obj &\r
$(OBJS)\monodll_graphicc.obj &\r
$(OBJS)\monodll_fontenumcmn.obj &\r
$(OBJS)\monodll_fontmap.obj &\r
$(OBJS)\monolib_clipcmn.obj &\r
$(OBJS)\monolib_clrpickercmn.obj &\r
$(OBJS)\monolib_colourcmn.obj &\r
+ $(OBJS)\monolib_colourdata.obj &\r
$(OBJS)\monolib_combocmn.obj &\r
$(OBJS)\monolib_cmdproc.obj &\r
$(OBJS)\monolib_cmndata.obj &\r
$(OBJS)\monolib_fontpickercmn.obj &\r
$(OBJS)\monolib_fldlgcmn.obj &\r
$(OBJS)\monolib_fontcmn.obj &\r
+ $(OBJS)\monolib_fontdata.obj &\r
$(OBJS)\monolib_graphicc.obj &\r
$(OBJS)\monolib_fontenumcmn.obj &\r
$(OBJS)\monolib_fontmap.obj &\r
$(OBJS)\monolib_clipcmn.obj &\r
$(OBJS)\monolib_clrpickercmn.obj &\r
$(OBJS)\monolib_colourcmn.obj &\r
+ $(OBJS)\monolib_colourdata.obj &\r
$(OBJS)\monolib_combocmn.obj &\r
$(OBJS)\monolib_cmdproc.obj &\r
$(OBJS)\monolib_cmndata.obj &\r
$(OBJS)\monolib_fontpickercmn.obj &\r
$(OBJS)\monolib_fldlgcmn.obj &\r
$(OBJS)\monolib_fontcmn.obj &\r
+ $(OBJS)\monolib_fontdata.obj &\r
$(OBJS)\monolib_graphicc.obj &\r
$(OBJS)\monolib_fontenumcmn.obj &\r
$(OBJS)\monolib_fontmap.obj &\r
$(OBJS)\coredll_clipcmn.obj &\r
$(OBJS)\coredll_clrpickercmn.obj &\r
$(OBJS)\coredll_colourcmn.obj &\r
+ $(OBJS)\coredll_colourdata.obj &\r
$(OBJS)\coredll_combocmn.obj &\r
$(OBJS)\coredll_cmdproc.obj &\r
$(OBJS)\coredll_cmndata.obj &\r
$(OBJS)\coredll_fontpickercmn.obj &\r
$(OBJS)\coredll_fldlgcmn.obj &\r
$(OBJS)\coredll_fontcmn.obj &\r
+ $(OBJS)\coredll_fontdata.obj &\r
$(OBJS)\coredll_graphicc.obj &\r
$(OBJS)\coredll_fontenumcmn.obj &\r
$(OBJS)\coredll_fontmap.obj &\r
$(OBJS)\coredll_clipcmn.obj &\r
$(OBJS)\coredll_clrpickercmn.obj &\r
$(OBJS)\coredll_colourcmn.obj &\r
+ $(OBJS)\coredll_colourdata.obj &\r
$(OBJS)\coredll_combocmn.obj &\r
$(OBJS)\coredll_cmdproc.obj &\r
$(OBJS)\coredll_cmndata.obj &\r
$(OBJS)\coredll_fontpickercmn.obj &\r
$(OBJS)\coredll_fldlgcmn.obj &\r
$(OBJS)\coredll_fontcmn.obj &\r
+ $(OBJS)\coredll_fontdata.obj &\r
$(OBJS)\coredll_graphicc.obj &\r
$(OBJS)\coredll_fontenumcmn.obj &\r
$(OBJS)\coredll_fontmap.obj &\r
$(OBJS)\corelib_clipcmn.obj &\r
$(OBJS)\corelib_clrpickercmn.obj &\r
$(OBJS)\corelib_colourcmn.obj &\r
+ $(OBJS)\corelib_colourdata.obj &\r
$(OBJS)\corelib_combocmn.obj &\r
$(OBJS)\corelib_cmdproc.obj &\r
$(OBJS)\corelib_cmndata.obj &\r
$(OBJS)\corelib_fontpickercmn.obj &\r
$(OBJS)\corelib_fldlgcmn.obj &\r
$(OBJS)\corelib_fontcmn.obj &\r
+ $(OBJS)\corelib_fontdata.obj &\r
$(OBJS)\corelib_graphicc.obj &\r
$(OBJS)\corelib_fontenumcmn.obj &\r
$(OBJS)\corelib_fontmap.obj &\r
$(OBJS)\corelib_clipcmn.obj &\r
$(OBJS)\corelib_clrpickercmn.obj &\r
$(OBJS)\corelib_colourcmn.obj &\r
+ $(OBJS)\corelib_colourdata.obj &\r
$(OBJS)\corelib_combocmn.obj &\r
$(OBJS)\corelib_cmdproc.obj &\r
$(OBJS)\corelib_cmndata.obj &\r
$(OBJS)\corelib_fontpickercmn.obj &\r
$(OBJS)\corelib_fldlgcmn.obj &\r
$(OBJS)\corelib_fontcmn.obj &\r
+ $(OBJS)\corelib_fontdata.obj &\r
$(OBJS)\corelib_graphicc.obj &\r
$(OBJS)\corelib_fontenumcmn.obj &\r
$(OBJS)\corelib_fontmap.obj &\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monodll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monodll_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monolib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monolib_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\coredll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\coredll_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\corelib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\corelib_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\src\common\colourdata.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\src\common\combocmn.cpp\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\src\common\fontdata.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\src\common\fontenumcmn.cpp\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\colourdata.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\combo.h\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\fontdata.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\fontdlg.h\r
# End Source File\r
# Begin Source File\r
<File\r
RelativePath="..\..\src\common\colourcmn.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\common\colourdata.cpp">\r
+ </File>\r
<File\r
RelativePath="..\..\src\common\combocmn.cpp">\r
</File>\r
<File\r
RelativePath="..\..\src\common\fontcmn.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\common\fontdata.cpp">\r
+ </File>\r
<File\r
RelativePath="..\..\src\common\fontenumcmn.cpp">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\colour.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\colourdata.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\combo.h">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\font.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\fontdata.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\fontdlg.h">\r
</File>\r
RelativePath="..\..\src\common\colourcmn.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\common\colourdata.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\common\combocmn.cpp"\r
>\r
RelativePath="..\..\src\common\fontcmn.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\common\fontdata.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\common\fontenumcmn.cpp"\r
>\r
RelativePath="..\..\include\wx\colour.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\colourdata.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\combo.h"\r
>\r
RelativePath="..\..\include\wx\font.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\fontdata.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\fontdlg.h"\r
>\r
RelativePath="..\..\src\common\colourcmn.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\common\colourdata.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\common\combocmn.cpp"\r
>\r
RelativePath="..\..\src\common\fontcmn.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\common\fontdata.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\common\fontenumcmn.cpp"\r
>\r
RelativePath="..\..\include\wx\colour.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\colourdata.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\combo.h"\r
>\r
RelativePath="..\..\include\wx\font.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\fontdata.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\fontdlg.h"\r
>\r
#ifndef _WX_CMNDATA_H_BASE_
#define _WX_CMNDATA_H_BASE_
-#include "wx/window.h"
-#include "wx/font.h"
-#include "wx/encinfo.h"
-#include "wx/colour.h"
+#include "wx/defs.h"
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
#include "wx/gdicmn.h"
#if wxUSE_STREAMS
#include "wx/stream.h"
#endif
-
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
-
-class WXDLLIMPEXP_CORE wxColourData : public wxObject
-{
-public:
- // number of custom colours we store
- enum
- {
- NUM_CUSTOM = 16
- };
-
- wxColourData();
- wxColourData(const wxColourData& data);
- wxColourData& operator=(const wxColourData& data);
- virtual ~wxColourData();
-
- void SetChooseFull(bool flag) { m_chooseFull = flag; }
- bool GetChooseFull() const { return m_chooseFull; }
- void SetColour(const wxColour& colour) { m_dataColour = colour; }
- const wxColour& GetColour() const { return m_dataColour; }
- wxColour& GetColour() { return m_dataColour; }
-
- // SetCustomColour() modifies colours in an internal array of NUM_CUSTOM
- // custom colours;
- void SetCustomColour(int i, const wxColour& colour);
- wxColour GetCustomColour(int i) const;
-
- // Serialize the object to a string and restore it from it
- wxString ToString() const;
- bool FromString(const wxString& str);
-
-
- // public for backwards compatibility only: don't use directly
-public:
- wxColour m_dataColour;
- wxColour m_custColours[NUM_CUSTOM];
- bool m_chooseFull;
-
-private:
- DECLARE_DYNAMIC_CLASS(wxColourData)
-};
-
-class WXDLLIMPEXP_CORE wxFontData : public wxObject
-{
-public:
- wxFontData();
- virtual ~wxFontData();
-
- wxFontData(const wxFontData& data)
- : wxObject(),
- m_fontColour(data.m_fontColour),
- m_showHelp(data.m_showHelp),
- m_allowSymbols(data.m_allowSymbols),
- m_enableEffects(data.m_enableEffects),
- m_initialFont(data.m_initialFont),
- m_chosenFont(data.m_chosenFont),
- m_minSize(data.m_minSize),
- m_maxSize(data.m_maxSize),
- m_encoding(data.m_encoding),
- m_encodingInfo(data.m_encodingInfo)
- {
- }
-
- wxFontData& operator=(const wxFontData& data)
- {
- if (&data != this)
- {
- wxObject::operator=(data);
- m_fontColour = data.m_fontColour;
- m_showHelp = data.m_showHelp;
- m_allowSymbols = data.m_allowSymbols;
- m_enableEffects = data.m_enableEffects;
- m_initialFont = data.m_initialFont;
- m_chosenFont = data.m_chosenFont;
- m_minSize = data.m_minSize;
- m_maxSize = data.m_maxSize;
- m_encoding = data.m_encoding;
- m_encodingInfo = data.m_encodingInfo;
- }
- return *this;
- }
-
- void SetAllowSymbols(bool flag) { m_allowSymbols = flag; }
- bool GetAllowSymbols() const { return m_allowSymbols; }
-
- void SetColour(const wxColour& colour) { m_fontColour = colour; }
- const wxColour& GetColour() const { return m_fontColour; }
-
- void SetShowHelp(bool flag) { m_showHelp = flag; }
- bool GetShowHelp() const { return m_showHelp; }
-
- void EnableEffects(bool flag) { m_enableEffects = flag; }
- bool GetEnableEffects() const { return m_enableEffects; }
-
- void SetInitialFont(const wxFont& font) { m_initialFont = font; }
- wxFont GetInitialFont() const { return m_initialFont; }
-
- void SetChosenFont(const wxFont& font) { m_chosenFont = font; }
- wxFont GetChosenFont() const { return m_chosenFont; }
-
- void SetRange(int minRange, int maxRange) { m_minSize = minRange; m_maxSize = maxRange; }
-
- // encoding info is split into 2 parts: the logical wxWin encoding
- // (wxFontEncoding) and a structure containing the native parameters for
- // it (wxNativeEncodingInfo)
- wxFontEncoding GetEncoding() const { return m_encoding; }
- void SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; }
-
- wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
-
-
- // public for backwards compatibility only: don't use directly
-public:
- wxColour m_fontColour;
- bool m_showHelp;
- bool m_allowSymbols;
- bool m_enableEffects;
- wxFont m_initialFont;
- wxFont m_chosenFont;
- int m_minSize;
- int m_maxSize;
-
-private:
- wxFontEncoding m_encoding;
- wxNativeEncodingInfo m_encodingInfo;
-
-private:
- DECLARE_DYNAMIC_CLASS(wxFontData)
-};
-
-#if wxUSE_PRINTING_ARCHITECTURE
/*
* wxPrintData
* Encapsulates printer information (not printer dialog information)
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/colrdlgg.h
+// Name: wx/colordlg.h
// Purpose: wxColourDialog
// Author: Vadim Zeitiln
// Modified by:
#if wxUSE_COLOURDLG
+#include "wx/colourdata.h"
+
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
#include "wx/msw/colordlg.h"
#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
#define wxColourDialog wxGenericColourDialog
#endif
-class WXDLLIMPEXP_FWD_CORE wxColourData;
-
// get the colour from user and return it
WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL,
const wxColour& colInit = wxNullColour,
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/colourdata.h
+// Author: Julian Smart
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_COLOURDATA_H_
+#define _WX_COLOURDATA_H_
+
+#include "wx/colour.h"
+
+class WXDLLIMPEXP_CORE wxColourData : public wxObject
+{
+public:
+ // number of custom colours we store
+ enum
+ {
+ NUM_CUSTOM = 16
+ };
+
+ wxColourData();
+ wxColourData(const wxColourData& data);
+ wxColourData& operator=(const wxColourData& data);
+ virtual ~wxColourData();
+
+ void SetChooseFull(bool flag) { m_chooseFull = flag; }
+ bool GetChooseFull() const { return m_chooseFull; }
+ void SetColour(const wxColour& colour) { m_dataColour = colour; }
+ const wxColour& GetColour() const { return m_dataColour; }
+ wxColour& GetColour() { return m_dataColour; }
+
+ // SetCustomColour() modifies colours in an internal array of NUM_CUSTOM
+ // custom colours;
+ void SetCustomColour(int i, const wxColour& colour);
+ wxColour GetCustomColour(int i) const;
+
+ // Serialize the object to a string and restore it from it
+ wxString ToString() const;
+ bool FromString(const wxString& str);
+
+
+ // public for backwards compatibility only: don't use directly
+ wxColour m_dataColour;
+ wxColour m_custColours[NUM_CUSTOM];
+ bool m_chooseFull;
+
+ DECLARE_DYNAMIC_CLASS(wxColourData)
+};
+
+#endif // _WX_COLOURDATA_H_
#include "wx/dynarray.h"
#include "wx/math.h"
#include "wx/image.h"
-#include "wx/cmndata.h"
+#include "wx/region.h"
#define wxUSE_NEW_DC 1
// forward declarations
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_FWD_CORE wxFontData;
-class WXDLLIMPEXP_FWD_CORE wxFontBase;
class WXDLLIMPEXP_FWD_CORE wxFont;
-class WXDLLIMPEXP_FWD_CORE wxSize;
// ----------------------------------------------------------------------------
// font constants
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/fontdata.h
+// Author: Julian Smart
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_FONTDATA_H_
+#define _WX_FONTDATA_H_
+
+#include "wx/font.h"
+#include "wx/colour.h"
+#include "wx/encinfo.h"
+
+class WXDLLIMPEXP_CORE wxFontData : public wxObject
+{
+public:
+ wxFontData();
+ virtual ~wxFontData();
+
+ wxFontData(const wxFontData& data);
+ wxFontData& operator=(const wxFontData& data);
+
+ void SetAllowSymbols(bool flag) { m_allowSymbols = flag; }
+ bool GetAllowSymbols() const { return m_allowSymbols; }
+
+ void SetColour(const wxColour& colour) { m_fontColour = colour; }
+ const wxColour& GetColour() const { return m_fontColour; }
+
+ void SetShowHelp(bool flag) { m_showHelp = flag; }
+ bool GetShowHelp() const { return m_showHelp; }
+
+ void EnableEffects(bool flag) { m_enableEffects = flag; }
+ bool GetEnableEffects() const { return m_enableEffects; }
+
+ void SetInitialFont(const wxFont& font) { m_initialFont = font; }
+ wxFont GetInitialFont() const { return m_initialFont; }
+
+ void SetChosenFont(const wxFont& font) { m_chosenFont = font; }
+ wxFont GetChosenFont() const { return m_chosenFont; }
+
+ void SetRange(int minRange, int maxRange) { m_minSize = minRange; m_maxSize = maxRange; }
+
+ // encoding info is split into 2 parts: the logical wxWin encoding
+ // (wxFontEncoding) and a structure containing the native parameters for
+ // it (wxNativeEncodingInfo)
+ wxFontEncoding GetEncoding() const { return m_encoding; }
+ void SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; }
+
+ wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
+
+
+ // public for backwards compatibility only: don't use directly
+ wxColour m_fontColour;
+ bool m_showHelp;
+ bool m_allowSymbols;
+ bool m_enableEffects;
+ wxFont m_initialFont;
+ wxFont m_chosenFont;
+ int m_minSize;
+ int m_maxSize;
+
+private:
+ wxFontEncoding m_encoding;
+ wxNativeEncodingInfo m_encodingInfo;
+
+ DECLARE_DYNAMIC_CLASS(wxFontData)
+};
+
+#endif // _WX_FONTDATA_H_
#if wxUSE_FONTDLG
#include "wx/dialog.h" // the base class
-#include "wx/cmndata.h" // wxFontData
+#include "wx/fontdata.h"
// ----------------------------------------------------------------------------
// wxFontDialog interface
#include "wx/button.h"
#include "wx/bmpbuttn.h"
-#include "wx/cmndata.h"
+#include "wx/colourdata.h"
//-----------------------------------------------------------------------------
// wxGenericColourButton: a button which brings up a wxColourDialog
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef __COLORDLGH_G__
-#define __COLORDLGH_G__
+#ifndef _WX_COLORDLGG_H_
+#define _WX_COLORDLGG_H_
-#include "wx/defs.h"
#include "wx/gdicmn.h"
#include "wx/dialog.h"
-#include "wx/cmndata.h"
#define wxID_ADD_CUSTOM 3000
DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
};
-#endif
+#endif // _WX_COLORDLGG_H_
#ifndef _WX_GENERIC_FONTDLGG_H
#define _WX_GENERIC_FONTDLGG_H
-#include "wx/defs.h"
#include "wx/gdicmn.h"
#include "wx/font.h"
-#include "wx/dialog.h"
-#include "wx/cmndata.h"
#ifdef __WXWINCE__
#define USE_SPINCTRL_FOR_POINT_SIZE 1
#define _WX_FONTPICKER_H_
#include "wx/button.h"
-#include "wx/cmndata.h"
+#include "wx/fontdata.h"
//-----------------------------------------------------------------------------
// wxGenericFontButton: a button which brings up a wxFontDialog
#define _WX_GTK_COLORDLG_H_
#include "wx/dialog.h"
-#include "wx/cmndata.h"
class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
{
#include "wx/defs.h"
#include "wx/gdicmn.h"
#include "wx/dialog.h"
-#include "wx/cmndata.h"
class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
-#include "wx/defs.h"
#include "wx/dialog.h"
-#include "wx/cmndata.h"
// ----------------------------------------------------------------------------
// wxColourDialog: dialog for choosing a colours
#define _WX_FONTDLG_H_
#include "wx/dialog.h"
-#include "wx/cmndata.h"
/*
* Font dialog
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
-#include "wx/defs.h"
#include "wx/dialog.h"
-#include "wx/cmndata.h"
/*
* Platform-specific colour dialog implementation
#define _WX_FONTDLG_H_
#include "wx/dialog.h"
-#include "wx/cmndata.h"
/*
* Font dialog
#include "wx/defs.h"
#include "wx/dialog.h"
-#include "wx/cmndata.h"
// ----------------------------------------------------------------------------
// wxColourDialog: dialog for choosing a colours
#include "wx/dialog.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
-#include "wx/cmndata.h"
#include "wx/dataobj.h"
#include "wx/control.h"
#include "wx/wx.h"
#endif
+#include "wx/fontdlg.h"
+
// -----------------------------------------------------------------------
// Custom version of wxFontProperty that also holds colour in the value.
// Original version by Vladimir Vainer.
-#include <wx/fontdlg.h>
-
IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(wxFontData)
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFontDataProperty,wxFontProperty,
#pragma hdrstop
#endif
+#if wxUSE_PRINTING_ARCHITECTURE
+
#include "wx/cmndata.h"
#ifndef WX_PRECOMP
#include "wx/gdicmn.h"
#endif
-#include "wx/tokenzr.h"
#include "wx/prntbase.h"
#include "wx/printdlg.h"
-
-#if wxUSE_FONTDLG
- #include "wx/fontdlg.h"
-#endif // wxUSE_FONTDLG
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
#include "wx/paper.h"
IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
-
// ============================================================================
// implementation
// ============================================================================
-// ----------------------------------------------------------------------------
-// wxColourData
-// ----------------------------------------------------------------------------
-
-wxColourData::wxColourData()
-{
- m_chooseFull = false;
- m_dataColour.Set(0,0,0);
- // m_custColours are wxNullColours initially
-}
-
-wxColourData::wxColourData(const wxColourData& data)
- : wxObject()
-{
- (*this) = data;
-}
-
-wxColourData::~wxColourData()
-{
-}
-
-void wxColourData::SetCustomColour(int i, const wxColour& colour)
-{
- wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, wxT("custom colour index out of range") );
-
- m_custColours[i] = colour;
-}
-
-wxColour wxColourData::GetCustomColour(int i) const
-{
- wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0),
- wxT("custom colour index out of range") );
-
- return m_custColours[i];
-}
-
-wxColourData& wxColourData::operator=(const wxColourData& data)
-{
- for ( int i = 0; i < NUM_CUSTOM; i++)
- m_custColours[i] = data.m_custColours[i];
-
- m_dataColour = data.m_dataColour;
- m_chooseFull = data.m_chooseFull;
-
- return *this;
-}
-
-// ----------------------------------------------------------------------------
-// [de]serialization
-// ----------------------------------------------------------------------------
-
-// separator used between different fields
-static const char wxCOL_DATA_SEP = ',';
-
-wxString wxColourData::ToString() const
-{
- wxString str(m_chooseFull ? '1' : '0');
-
- for ( int i = 0; i < NUM_CUSTOM; i++ )
- {
- str += wxCOL_DATA_SEP;
-
- const wxColour& clr = m_custColours[i];
- if ( clr.IsOk() )
- str += clr.GetAsString(wxC2S_HTML_SYNTAX);
- }
-
- return str;
-}
-
-bool wxColourData::FromString(const wxString& str)
-{
- wxStringTokenizer tokenizer(str, wxCOL_DATA_SEP);
- wxString token = tokenizer.GetNextToken();
- m_chooseFull = token == '1';
- bool success = m_chooseFull || token == '0';
- for (int i = 0; success && i < NUM_CUSTOM; i++)
- {
- token = tokenizer.GetNextToken();
- if (token.empty())
- m_custColours[i] = wxNullColour;
- else
- success = m_custColours[i].Set(token);
- }
- return success;
-}
-
-// ----------------------------------------------------------------------------
-// Font data
-// ----------------------------------------------------------------------------
-
-wxFontData::wxFontData()
-{
- // Intialize colour to black.
- m_fontColour = wxNullColour;
-
- m_showHelp = false;
- m_allowSymbols = true;
- m_enableEffects = true;
- m_minSize = 0;
- m_maxSize = 0;
-
- m_encoding = wxFONTENCODING_SYSTEM;
-}
-
-wxFontData::~wxFontData()
-{
-}
-
-#if wxUSE_FONTDLG
-
-wxFontDialogBase::~wxFontDialogBase()
-{
-}
-
-#endif // wxUSE_FONTDLG
-
-#if wxUSE_PRINTING_ARCHITECTURE
// ----------------------------------------------------------------------------
// Print data
// ----------------------------------------------------------------------------
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/common/colourdata.cpp
+// Author: Julian Smart
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_COLOURDLG || wxUSE_COLOURPICKERCTRL
+
+#include "wx/colourdata.h"
+#include "wx/tokenzr.h"
+
+// ----------------------------------------------------------------------------
+// wxColourData
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+
+wxColourData::wxColourData()
+{
+ m_chooseFull = false;
+ m_dataColour.Set(0,0,0);
+ // m_custColours are wxNullColours initially
+}
+
+wxColourData::wxColourData(const wxColourData& data)
+ : wxObject()
+{
+ (*this) = data;
+}
+
+wxColourData::~wxColourData()
+{
+}
+
+void wxColourData::SetCustomColour(int i, const wxColour& colour)
+{
+ wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, wxT("custom colour index out of range") );
+
+ m_custColours[i] = colour;
+}
+
+wxColour wxColourData::GetCustomColour(int i) const
+{
+ wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0),
+ wxT("custom colour index out of range") );
+
+ return m_custColours[i];
+}
+
+wxColourData& wxColourData::operator=(const wxColourData& data)
+{
+ for ( int i = 0; i < NUM_CUSTOM; i++)
+ m_custColours[i] = data.m_custColours[i];
+
+ m_dataColour = data.m_dataColour;
+ m_chooseFull = data.m_chooseFull;
+
+ return *this;
+}
+
+// ----------------------------------------------------------------------------
+// [de]serialization
+// ----------------------------------------------------------------------------
+
+// separator used between different fields
+static const char wxCOL_DATA_SEP = ',';
+
+wxString wxColourData::ToString() const
+{
+ wxString str(m_chooseFull ? '1' : '0');
+
+ for ( int i = 0; i < NUM_CUSTOM; i++ )
+ {
+ str += wxCOL_DATA_SEP;
+
+ const wxColour& clr = m_custColours[i];
+ if ( clr.IsOk() )
+ str += clr.GetAsString(wxC2S_HTML_SYNTAX);
+ }
+
+ return str;
+}
+
+bool wxColourData::FromString(const wxString& str)
+{
+ wxStringTokenizer tokenizer(str, wxCOL_DATA_SEP);
+ wxString token = tokenizer.GetNextToken();
+ m_chooseFull = token == '1';
+ bool success = m_chooseFull || token == '0';
+ for (int i = 0; success && i < NUM_CUSTOM; i++)
+ {
+ token = tokenizer.GetNextToken();
+ if (token.empty())
+ m_custColours[i] = wxColour();
+ else
+ success = m_custColours[i].Set(token);
+ }
+ return success;
+}
+#endif // wxUSE_COLOURDLG || wxUSE_COLOURPICKERCTRL
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/common/fontdata.cpp
+// Author: Julian Smart
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL
+
+#include "wx/fontdata.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+
+wxFontData::wxFontData()
+{
+ m_showHelp = false;
+ m_allowSymbols = true;
+ m_enableEffects = true;
+ m_minSize = 0;
+ m_maxSize = 0;
+
+ m_encoding = wxFONTENCODING_SYSTEM;
+}
+
+wxFontData::~wxFontData()
+{
+}
+
+wxFontData::wxFontData(const wxFontData& data)
+ : wxObject(),
+ m_fontColour(data.m_fontColour),
+ m_showHelp(data.m_showHelp),
+ m_allowSymbols(data.m_allowSymbols),
+ m_enableEffects(data.m_enableEffects),
+ m_initialFont(data.m_initialFont),
+ m_chosenFont(data.m_chosenFont),
+ m_minSize(data.m_minSize),
+ m_maxSize(data.m_maxSize),
+ m_encoding(data.m_encoding),
+ m_encodingInfo(data.m_encodingInfo)
+{
+}
+
+wxFontData& wxFontData::operator=(const wxFontData& data)
+{
+ if (&data != this)
+ {
+ wxObject::operator=(data);
+ m_fontColour = data.m_fontColour;
+ m_showHelp = data.m_showHelp;
+ m_allowSymbols = data.m_allowSymbols;
+ m_enableEffects = data.m_enableEffects;
+ m_initialFont = data.m_initialFont;
+ m_chosenFont = data.m_chosenFont;
+ m_minSize = data.m_minSize;
+ m_maxSize = data.m_maxSize;
+ m_encoding = data.m_encoding;
+ m_encodingInfo = data.m_encodingInfo;
+ }
+ return *this;
+}
+#endif // wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL
return wxTestFontEncoding(info);
}
+#if wxUSE_FONTDLG
+wxFontDialogBase::~wxFontDialogBase()
+{
+}
+#endif
+
#endif // wxUSE_FONTMAP
#include "wx/statline.h"
#endif
+#include "wx/colourdata.h"
#include "wx/generic/colrdlgg.h"
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
#include "wx/icon.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
- #include "wx/cmndata.h"
#include "wx/choice.h"
#include "wx/textctrl.h"
#include "wx/layout.h"
#include "wx/checkbox.h"
#include "wx/intl.h"
#include "wx/settings.h"
- #include "wx/cmndata.h"
#include "wx/sizer.h"
#endif
#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#include "wx/dcprint.h"
+ #ifdef __WXGTK__
+ #include "wx/window.h"
+ #endif
#endif
#include "wx/private/graphics.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/settings.h"
- #include "wx/cmndata.h"
#include "wx/gdicmn.h"
#endif
#include "wx/settings.h"
#ifndef WX_PRECOMP
- #include "wx/cmndata.h"
#include "wx/toplevel.h"
#endif
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/settings.h"
- #include "wx/cmndata.h"
#include "wx/gdicmn.h"
#endif
#include "wx/settings.h"
#ifndef WX_PRECOMP
- #include "wx/cmndata.h"
#include "wx/toplevel.h"
#endif
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/utils.h"
- #include "wx/dialog.h"
- #include "wx/cmndata.h"
#include "wx/math.h"
#endif
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/log.h"
- #include "wx/encinfo.h"
+ #include "wx/msw/private.h"
#endif // WX_PRECOMP
-#include "wx/msw/private.h"
-
+#include "wx/encinfo.h"
#include "wx/fontutil.h"
#include "wx/fontmap.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/log.h"
- #include "wx/cmndata.h"
#include "wx/math.h"
#endif
#if wxUSE_FONTENUM
+#include "wx/fontenum.h"
+
#ifndef WX_PRECOMP
#include "wx/gdicmn.h"
#include "wx/font.h"
- #include "wx/encinfo.h"
#include "wx/dynarray.h"
+ #include "wx/msw/private.h"
#endif
-#include "wx/msw/private.h"
-
+#include "wx/encinfo.h"
#include "wx/fontutil.h"
-#include "wx/fontenum.h"
#include "wx/fontmap.h"
// ----------------------------------------------------------------------------
#pragma hdrstop
#endif
+#include "wx/fontutil.h"
+
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/log.h"
#include "wx/intl.h"
- #include "wx/encinfo.h"
#include "wx/wxcrtvararg.h"
+ #include "wx/msw/private.h"
#endif //WX_PRECOMP
-#include "wx/msw/private.h"
-
-#include "wx/fontutil.h"
+#include "wx/encinfo.h"
#include "wx/fontmap.h"
-
#include "wx/tokenzr.h"
// for MSVC5 and old w32api
#include <stdio.h>
#include "wx/utils.h"
#include "wx/dialog.h"
- #include "wx/cmndata.h"
#endif
#include "wx/os2/private.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/math.h"
- #include "wx/cmndata.h"
#endif
#include "wx/fontutil.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dialog.h"
- #include "wx/cmndata.h"
#endif // WX_PRECOMP
#include "wx/filename.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
- #include "wx/cmndata.h"
#endif
#include <UIColor.h>
#include "wx/dialog.h"
#include "wx/math.h"
#include "wx/log.h"
- #include "wx/cmndata.h"
#endif
#include "wx/palmos/private.h"
projects / wxWidgets.git / commitdiff
