AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generic font dialog is still an option in wxMSW in non Univ mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-06-11 19:24:59 +00:00
parent 781a24e82f
commit 23c47bc1f3
8 changed files with 114 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@ -2889,6 +2889,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_tglbtn.o \
monodll_treectrl.o \
monodll_colrdlgg.o \
monodll_fontdlgg.o \
monodll_fdrepdlg.o \
monodll_fontdlg.o \
monodll_helpchm.o \
@ -3749,6 +3750,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_tglbtn.o \
monolib_treectrl.o \
monolib_colrdlgg.o \
monolib_fontdlgg.o \
monolib_fdrepdlg.o \
monolib_fontdlg.o \
monolib_helpchm.o \
@ -4781,6 +4783,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_tglbtn.o \
coredll_treectrl.o \
coredll_colrdlgg.o \
coredll_fontdlgg.o \
coredll_fdrepdlg.o \
coredll_fontdlg.o \
coredll_helpchm.o \
@ -5508,6 +5511,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_tglbtn.o \
corelib_treectrl.o \
corelib_colrdlgg.o \
corelib_fontdlgg.o \
corelib_fdrepdlg.o \
corelib_fontdlg.o \
corelib_helpchm.o \
@ -9628,6 +9632,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@ -12571,6 +12578,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@ -15781,6 +15791,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@ -18211,6 +18224,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

1
build/bakefiles/files.bkl
View File

@ -1296,6 +1296,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
<set var="MSW_ONLY_SRC" hints="files">
src/generic/colrdlgg.cpp
src/generic/fontdlgg.cpp
src/msw/fdrepdlg.cpp
src/msw/fontdlg.cpp
src/msw/helpchm.cpp

36
build/msw/makefile.bcc
View File

@ -994,6 +994,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tglbtn.obj \
$(OBJS)\monodll_treectrl.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_fontdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
$(OBJS)\monodll_helpchm.obj \
@ -1430,6 +1431,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tglbtn.obj \
$(OBJS)\monolib_treectrl.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_fontdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
$(OBJS)\monolib_helpchm.obj \
@ -1839,6 +1841,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tglbtn.obj \
$(OBJS)\coredll_treectrl.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_fontdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
$(OBJS)\coredll_helpchm.obj \
@ -2232,6 +2235,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tglbtn.obj \
$(OBJS)\corelib_treectrl.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_fontdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
$(OBJS)\corelib_helpchm.obj \
@ -3675,9 +3679,6 @@ $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@ -4343,6 +4344,11 @@ $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@ -5149,9 +5155,6 @@ $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@ -5817,6 +5820,11 @@ $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@ -6899,9 +6907,6 @@ $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@ -7444,6 +7449,11 @@ $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@ -8028,9 +8038,6 @@ $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@ -8573,6 +8580,11 @@ $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

36
build/msw/makefile.gcc
View File

@ -982,6 +982,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tglbtn.o \
$(OBJS)\monodll_treectrl.o \
$(OBJS)\monodll_colrdlgg.o \
$(OBJS)\monodll_fontdlgg.o \
$(OBJS)\monodll_fdrepdlg.o \
$(OBJS)\monodll_fontdlg.o \
$(OBJS)\monodll_helpchm.o \
@ -1424,6 +1425,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tglbtn.o \
$(OBJS)\monolib_treectrl.o \
$(OBJS)\monolib_colrdlgg.o \
$(OBJS)\monolib_fontdlgg.o \
$(OBJS)\monolib_fdrepdlg.o \
$(OBJS)\monolib_fontdlg.o \
$(OBJS)\monolib_helpchm.o \
@ -1849,6 +1851,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tglbtn.o \
$(OBJS)\coredll_treectrl.o \
$(OBJS)\coredll_colrdlgg.o \
$(OBJS)\coredll_fontdlgg.o \
$(OBJS)\coredll_fdrepdlg.o \
$(OBJS)\coredll_fontdlg.o \
$(OBJS)\coredll_helpchm.o \
@ -2250,6 +2253,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tglbtn.o \
$(OBJS)\corelib_treectrl.o \
$(OBJS)\corelib_colrdlgg.o \
$(OBJS)\corelib_fontdlgg.o \
$(OBJS)\corelib_fdrepdlg.o \
$(OBJS)\corelib_fontdlg.o \
$(OBJS)\corelib_helpchm.o \
@ -3715,9 +3719,6 @@ $(OBJS)\monodll_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(OBJS)\monodll_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@ -4479,6 +4480,11 @@ $(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monodll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@ -5289,9 +5295,6 @@ $(OBJS)\monolib_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(OBJS)\monolib_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@ -6053,6 +6056,11 @@ $(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monolib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@ -7139,9 +7147,6 @@ $(OBJS)\coredll_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(OBJS)\coredll_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@ -7780,6 +7785,11 @@ $(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\coredll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@ -8368,9 +8378,6 @@ $(OBJS)\corelib_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(OBJS)\corelib_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@ -9009,6 +9016,11 @@ $(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\corelib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp

36
build/msw/makefile.vc
View File

@ -1201,6 +1201,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tglbtn.obj \
$(OBJS)\monodll_treectrl.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_fontdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
$(OBJS)\monodll_helpchm.obj \
@ -1655,6 +1656,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tglbtn.obj \
$(OBJS)\monolib_treectrl.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_fontdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
$(OBJS)\monolib_helpchm.obj \
@ -2154,6 +2156,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tglbtn.obj \
$(OBJS)\coredll_treectrl.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_fontdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
$(OBJS)\coredll_helpchm.obj \
@ -2565,6 +2568,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tglbtn.obj \
$(OBJS)\corelib_treectrl.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_fontdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
$(OBJS)\corelib_helpchm.obj \
@ -4230,9 +4234,6 @@ $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@ -4898,6 +4899,11 @@ $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@ -5704,9 +5710,6 @@ $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@ -6372,6 +6375,11 @@ $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@ -7454,9 +7462,6 @@ $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@ -7999,6 +8004,11 @@ $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@ -8583,9 +8593,6 @@ $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@ -9128,6 +9135,11 @@ $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

36
build/msw/makefile.wat
View File

@ -229,6 +229,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_tglbtn.obj &
$(OBJS)\monodll_treectrl.obj &
$(OBJS)\monodll_colrdlgg.obj &
$(OBJS)\monodll_fontdlgg.obj &
$(OBJS)\monodll_fdrepdlg.obj &
$(OBJS)\monodll_fontdlg.obj &
$(OBJS)\monodll_helpchm.obj &
@ -674,6 +675,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_tglbtn.obj &
$(OBJS)\monolib_treectrl.obj &
$(OBJS)\monolib_colrdlgg.obj &
$(OBJS)\monolib_fontdlgg.obj &
$(OBJS)\monolib_fdrepdlg.obj &
$(OBJS)\monolib_fontdlg.obj &
$(OBJS)\monolib_helpchm.obj &
@ -1105,6 +1107,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_tglbtn.obj &
$(OBJS)\coredll_treectrl.obj &
$(OBJS)\coredll_colrdlgg.obj &
$(OBJS)\coredll_fontdlgg.obj &
$(OBJS)\coredll_fdrepdlg.obj &
$(OBJS)\coredll_fontdlg.obj &
$(OBJS)\coredll_helpchm.obj &
@ -1508,6 +1511,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_tglbtn.obj &
$(OBJS)\corelib_treectrl.obj &
$(OBJS)\corelib_colrdlgg.obj &
$(OBJS)\corelib_fontdlgg.obj &
$(OBJS)\corelib_fdrepdlg.obj &
$(OBJS)\corelib_fontdlg.obj &
$(OBJS)\corelib_helpchm.obj &
@ -3905,9 +3909,6 @@ $(OBJS)\monodll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(OBJS)\monodll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@ -4669,6 +4670,11 @@ $(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@ -5479,9 +5485,6 @@ $(OBJS)\monolib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(OBJS)\monolib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@ -6243,6 +6246,11 @@ $(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@ -7329,9 +7337,6 @@ $(OBJS)\coredll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(OBJS)\coredll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@ -7970,6 +7975,11 @@ $(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@ -8558,9 +8568,6 @@ $(OBJS)\corelib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(OBJS)\corelib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@ -9199,6 +9206,11 @@ $(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp

59
build/msw/wx_core.dsp
View File

@ -4217,65 +4217,6 @@ SOURCE=..\..\src\generic\filedlgg.cpp
# Begin Source File
SOURCE=..\..\src\generic\fontdlgg.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File

1
src/generic/fontdlgg.cpp
View File

@ -42,6 +42,7 @@
#include "wx/cmndata.h"
#include "wx/sizer.h"
#include "wx/fontdlg.h"
#include "wx/generic/fontdlgg.h"
#include "wx/settings.h"
//-----------------------------------------------------------------------------