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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-11 18:37:15 +00:00
parent 5a3b6b0782
commit 524bb0fad0
7 changed files with 113 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@@ -2888,6 +2888,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_textctrl.o \
monodll_tglbtn.o \
monodll_treectrl.o \
monodll_colrdlgg.o \
monodll_fdrepdlg.o \
monodll_fontdlg.o \
monodll_helpchm.o \
@@ -3747,6 +3748,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_textctrl.o \
monolib_tglbtn.o \
monolib_treectrl.o \
monolib_colrdlgg.o \
monolib_fdrepdlg.o \
monolib_fontdlg.o \
monolib_helpchm.o \
@@ -4778,6 +4780,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_textctrl.o \
coredll_tglbtn.o \
coredll_treectrl.o \
coredll_colrdlgg.o \
coredll_fdrepdlg.o \
coredll_fontdlg.o \
coredll_helpchm.o \
@@ -5504,6 +5507,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_textctrl.o \
corelib_tglbtn.o \
corelib_treectrl.o \
corelib_colrdlgg.o \
corelib_fdrepdlg.o \
corelib_fontdlg.o \
corelib_helpchm.o \
@@ -9435,6 +9439,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.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_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -12375,6 +12382,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.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_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -15582,6 +15592,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.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_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -18009,6 +18022,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.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_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

1
build/bakefiles/files.bkl
View File

@@ -1295,6 +1295,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/msw/fdrepdlg.cpp
src/msw/fontdlg.cpp
src/msw/helpchm.cpp

36
build/msw/makefile.bcc
View File

@@ -993,6 +993,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_textctrl.obj \
$(OBJS)\monodll_tglbtn.obj \
$(OBJS)\monodll_treectrl.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
$(OBJS)\monodll_helpchm.obj \
@@ -1428,6 +1429,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_textctrl.obj \
$(OBJS)\monolib_tglbtn.obj \
$(OBJS)\monolib_treectrl.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
$(OBJS)\monolib_helpchm.obj \
@@ -1836,6 +1838,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_textctrl.obj \
$(OBJS)\coredll_tglbtn.obj \
$(OBJS)\coredll_treectrl.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
$(OBJS)\coredll_helpchm.obj \
@@ -2228,6 +2231,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_textctrl.obj \
$(OBJS)\corelib_tglbtn.obj \
$(OBJS)\corelib_treectrl.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
$(OBJS)\corelib_helpchm.obj \
@@ -3665,9 +3669,6 @@ $(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4337,6 +4338,11 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.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) $**
@@ -5137,9 +5143,6 @@ $(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -5809,6 +5812,11 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.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) $**
@@ -6885,9 +6893,6 @@ $(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -7434,6 +7439,11 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.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) $**
@@ -8012,9 +8022,6 @@ $(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -8561,6 +8568,11 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.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

@@ -981,6 +981,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_textctrl.o \
$(OBJS)\monodll_tglbtn.o \
$(OBJS)\monodll_treectrl.o \
$(OBJS)\monodll_colrdlgg.o \
$(OBJS)\monodll_fdrepdlg.o \
$(OBJS)\monodll_fontdlg.o \
$(OBJS)\monodll_helpchm.o \
@@ -1422,6 +1423,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_textctrl.o \
$(OBJS)\monolib_tglbtn.o \
$(OBJS)\monolib_treectrl.o \
$(OBJS)\monolib_colrdlgg.o \
$(OBJS)\monolib_fdrepdlg.o \
$(OBJS)\monolib_fontdlg.o \
$(OBJS)\monolib_helpchm.o \
@@ -1846,6 +1848,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_textctrl.o \
$(OBJS)\coredll_tglbtn.o \
$(OBJS)\coredll_treectrl.o \
$(OBJS)\coredll_colrdlgg.o \
$(OBJS)\coredll_fdrepdlg.o \
$(OBJS)\coredll_fontdlg.o \
$(OBJS)\coredll_helpchm.o \
@@ -2246,6 +2249,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_textctrl.o \
$(OBJS)\corelib_tglbtn.o \
$(OBJS)\corelib_treectrl.o \
$(OBJS)\corelib_colrdlgg.o \
$(OBJS)\corelib_fdrepdlg.o \
$(OBJS)\corelib_fontdlg.o \
$(OBJS)\corelib_helpchm.o \
@@ -3705,9 +3709,6 @@ $(OBJS)\monodll_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\monodll_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -4473,6 +4474,11 @@ $(OBJS)\monodll_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monodll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@@ -5277,9 +5283,6 @@ $(OBJS)\monolib_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\monolib_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -6045,6 +6048,11 @@ $(OBJS)\monolib_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monolib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@@ -7125,9 +7133,6 @@ $(OBJS)\coredll_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\coredll_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -7770,6 +7775,11 @@ $(OBJS)\coredll_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\coredll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@@ -8352,9 +8362,6 @@ $(OBJS)\corelib_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\corelib_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -8997,6 +9004,11 @@ $(OBJS)\corelib_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.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

@@ -1200,6 +1200,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_textctrl.obj \
$(OBJS)\monodll_tglbtn.obj \
$(OBJS)\monodll_treectrl.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
$(OBJS)\monodll_helpchm.obj \
@@ -1653,6 +1654,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_textctrl.obj \
$(OBJS)\monolib_tglbtn.obj \
$(OBJS)\monolib_treectrl.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
$(OBJS)\monolib_helpchm.obj \
@@ -2151,6 +2153,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_textctrl.obj \
$(OBJS)\coredll_tglbtn.obj \
$(OBJS)\coredll_treectrl.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
$(OBJS)\coredll_helpchm.obj \
@@ -2561,6 +2564,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_textctrl.obj \
$(OBJS)\corelib_tglbtn.obj \
$(OBJS)\corelib_treectrl.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
$(OBJS)\corelib_helpchm.obj \
@@ -4220,9 +4224,6 @@ $(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4892,6 +4893,11 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.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) $**
@@ -5692,9 +5698,6 @@ $(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6364,6 +6367,11 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.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) $**
@@ -7440,9 +7448,6 @@ $(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -7989,6 +7994,11 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.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) $**
@@ -8567,9 +8577,6 @@ $(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -9116,6 +9123,11 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.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

@@ -228,6 +228,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_textctrl.obj &
$(OBJS)\monodll_tglbtn.obj &
$(OBJS)\monodll_treectrl.obj &
$(OBJS)\monodll_colrdlgg.obj &
$(OBJS)\monodll_fdrepdlg.obj &
$(OBJS)\monodll_fontdlg.obj &
$(OBJS)\monodll_helpchm.obj &
@@ -672,6 +673,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_textctrl.obj &
$(OBJS)\monolib_tglbtn.obj &
$(OBJS)\monolib_treectrl.obj &
$(OBJS)\monolib_colrdlgg.obj &
$(OBJS)\monolib_fdrepdlg.obj &
$(OBJS)\monolib_fontdlg.obj &
$(OBJS)\monolib_helpchm.obj &
@@ -1102,6 +1104,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_textctrl.obj &
$(OBJS)\coredll_tglbtn.obj &
$(OBJS)\coredll_treectrl.obj &
$(OBJS)\coredll_colrdlgg.obj &
$(OBJS)\coredll_fdrepdlg.obj &
$(OBJS)\coredll_fontdlg.obj &
$(OBJS)\coredll_helpchm.obj &
@@ -1504,6 +1507,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_textctrl.obj &
$(OBJS)\corelib_tglbtn.obj &
$(OBJS)\corelib_treectrl.obj &
$(OBJS)\corelib_colrdlgg.obj &
$(OBJS)\corelib_fdrepdlg.obj &
$(OBJS)\corelib_fontdlg.obj &
$(OBJS)\corelib_helpchm.obj &
@@ -3895,9 +3899,6 @@ $(OBJS)\monodll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -4663,6 +4664,11 @@ $(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@@ -5467,9 +5473,6 @@ $(OBJS)\monolib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -6235,6 +6238,11 @@ $(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@@ -7315,9 +7323,6 @@ $(OBJS)\coredll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -7960,6 +7965,11 @@ $(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@@ -8542,9 +8552,6 @@ $(OBJS)\corelib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -9187,6 +9194,11 @@ $(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.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

@@ -4012,65 +4012,6 @@ SOURCE=..\..\src\generic\choicdgg.cpp
# Begin Source File
SOURCE=..\..\src\generic\colrdlgg.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