Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

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