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

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