From d98766152b5c56ac9537cec56012c5d4dad5f39b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 21 Jan 2005 13:42:58 +0000 Subject: [PATCH] put datectlg.cpp in ADVANCED_SRC so that it can be used in all ports, even MSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 55 +++++++++++++------------------- build/bakefiles/files.bkl | 5 ++- build/msw/makefile.bcc | 40 +++++++++++++---------- build/msw/makefile.gcc | 40 +++++++++++++---------- build/msw/makefile.vc | 40 +++++++++++++---------- build/msw/makefile.wat | 40 +++++++++++++---------- build/msw/wx_adv.dsp | 8 +++++ build/msw/wx_core.dsp | 67 +++------------------------------------ src/wxWindows.dsp | 8 +++++ 9 files changed, 140 insertions(+), 163 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4b20c82b5b..463b5a036d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1427,7 +1427,6 @@ COND_TOOLKIT_COCOA_GUI_HDR = \ wx/generic/tabg.h @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR) COND_TOOLKIT_GTK_GUI_HDR = \ - wx/generic/datectrl.h \ wx/generic/colrdlgg.h \ wx/generic/dirdlgg.h \ wx/generic/fdrepdlg.h \ @@ -2074,6 +2073,7 @@ COND_WXUNIV_0_ADVANCED_HDR = \ wx/dateevt.h \ wx/dcbuffer.h \ wx/generic/calctrl.h \ + wx/generic/datectrl.h \ wx/generic/grid.h \ wx/generic/gridctrl.h \ wx/generic/gridsel.h \ @@ -2101,6 +2101,7 @@ COND_WXUNIV_1_ADVANCED_HDR = \ wx/dateevt.h \ wx/dcbuffer.h \ wx/generic/calctrl.h \ + wx/generic/datectrl.h \ wx/generic/grid.h \ wx/generic/gridctrl.h \ wx/generic/gridsel.h \ @@ -2773,7 +2774,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS_1) \ monodll_accel.o \ monodll_colrdlgg.o \ - monodll_datectlg.o \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ monodll_filedlgg.o \ @@ -3229,7 +3229,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ - monodll_datectlg.o \ monodll_accel.o \ monodll_colrdlgg.o \ monodll_dirdlgg.o \ @@ -3846,6 +3845,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1) COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ monodll_calctrl.o \ + monodll_datectlg.o \ monodll_grid.o \ monodll_gridctrl.o \ monodll_gridsel.o \ @@ -3860,6 +3860,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS) COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \ monodll_calctrl.o \ + monodll_datectlg.o \ monodll_grid.o \ monodll_gridctrl.o \ monodll_gridsel.o \ @@ -4214,7 +4215,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_3) \ monolib_accel.o \ monolib_colrdlgg.o \ - monolib_datectlg.o \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ monolib_filedlgg.o \ @@ -4671,7 +4671,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ - monolib_datectlg.o \ monolib_accel.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ @@ -5289,6 +5288,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3) COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ monolib_calctrl.o \ + monolib_datectlg.o \ monolib_grid.o \ monolib_gridctrl.o \ monolib_gridsel.o \ @@ -5303,6 +5303,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1) COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \ monolib_calctrl.o \ + monolib_datectlg.o \ monolib_grid.o \ monolib_gridctrl.o \ monolib_gridsel.o \ @@ -5846,7 +5847,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_5) \ coredll_accel.o \ coredll_colrdlgg.o \ - coredll_datectlg.o \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ coredll_filedlgg.o \ @@ -6303,7 +6303,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ - coredll_datectlg.o \ coredll_accel.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ @@ -7039,7 +7038,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_7) \ corelib_accel.o \ corelib_colrdlgg.o \ - corelib_datectlg.o \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ corelib_filedlgg.o \ @@ -7496,7 +7494,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ - corelib_datectlg.o \ corelib_accel.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ @@ -8142,6 +8139,7 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \ @COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd) COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 = \ advdll_calctrl.o \ + advdll_datectlg.o \ advdll_grid.o \ advdll_gridctrl.o \ advdll_gridsel.o \ @@ -8156,6 +8154,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 = \ @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2) COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \ advdll_calctrl.o \ + advdll_datectlg.o \ advdll_grid.o \ advdll_gridctrl.o \ advdll_gridsel.o \ @@ -8181,6 +8180,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \ @COND_GCC_PCH_1@ = .pch/wxprec_advlib/wx/wxprec.h.gch COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \ advlib_calctrl.o \ + advlib_datectlg.o \ advlib_grid.o \ advlib_gridctrl.o \ advlib_gridsel.o \ @@ -8195,6 +8195,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \ @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3) COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \ advlib_calctrl.o \ + advlib_datectlg.o \ advlib_grid.o \ advlib_gridctrl.o \ advlib_gridsel.o \ @@ -11597,12 +11598,6 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@monodll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp @@ -12935,6 +12930,9 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp +@COND_USE_GUI_1@monodll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp + @COND_USE_GUI_1@monodll_grid.o: $(srcdir)/src/generic/grid.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/grid.cpp @@ -14981,12 +14979,6 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@monolib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp @@ -16319,6 +16311,9 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp +@COND_USE_GUI_1@monolib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp + @COND_USE_GUI_1@monolib_grid.o: $(srcdir)/src/generic/grid.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/grid.cpp @@ -18767,12 +18762,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@coredll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@coredll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp @@ -21266,12 +21255,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@corelib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@corelib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp @@ -22583,6 +22566,9 @@ advdll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVDLL_ODEP) advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp +advdll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp + advdll_grid.o: $(srcdir)/src/generic/grid.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/grid.cpp @@ -22712,6 +22698,9 @@ advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP) advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp +advlib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp + advlib_grid.o: $(srcdir)/src/generic/grid.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/grid.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 97e95a0379..5f86ae24b0 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -828,7 +828,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - src/generic/datectlg.cpp src/generic/accel.cpp src/generic/colrdlgg.cpp src/generic/dirdlgg.cpp @@ -879,7 +878,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/utilsres.cpp - wx/generic/datectrl.h wx/generic/colrdlgg.h wx/generic/dirdlgg.h wx/generic/fdrepdlg.h @@ -2162,7 +2160,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/accel.cpp src/generic/colrdlgg.cpp - src/generic/datectlg.cpp src/generic/dirdlgg.cpp src/generic/fdrepdlg.cpp src/generic/filedlgg.cpp @@ -2263,6 +2260,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/calctrl.cpp + src/generic/datectlg.cpp src/generic/grid.cpp src/generic/gridctrl.cpp src/generic/gridsel.cpp @@ -2279,6 +2277,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/dateevt.h wx/dcbuffer.h wx/generic/calctrl.h + wx/generic/datectrl.h wx/generic/grid.h wx/generic/gridctrl.h wx/generic/gridsel.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 3d4070fe6a..5f7c46939d 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1285,7 +1285,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_colrdlgg.obj \ - $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_dirdlgg.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_filedlgg.obj \ @@ -1433,6 +1432,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -1451,6 +1451,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -1787,7 +1788,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_colrdlgg.obj \ - $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_dirdlgg.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_filedlgg.obj \ @@ -1935,6 +1935,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -1953,6 +1954,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -2234,7 +2236,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_colrdlgg.obj \ - $(OBJS)\coredll_datectlg.obj \ $(OBJS)\coredll_dirdlgg.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_filedlgg.obj \ @@ -2630,7 +2631,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_colrdlgg.obj \ - $(OBJS)\corelib_datectlg.obj \ $(OBJS)\corelib_dirdlgg.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_filedlgg.obj \ @@ -2782,6 +2782,7 @@ __advdll___depname = \ !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datectlg.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -2800,6 +2801,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datectlg.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -2821,6 +2823,7 @@ __advlib___depname = \ !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datectlg.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -2839,6 +2842,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datectlg.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -4075,9 +4079,6 @@ $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5331,6 +5332,11 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5735,9 +5741,6 @@ $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6991,6 +6994,11 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7695,9 +7703,6 @@ $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** - $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8832,9 +8837,6 @@ $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** - $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9885,6 +9887,9 @@ $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -9933,6 +9938,9 @@ $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 9780016672..8ef7833449 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1281,7 +1281,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_accel.o \ $(OBJS)\monodll_colrdlgg.o \ - $(OBJS)\monodll_datectlg.o \ $(OBJS)\monodll_dirdlgg.o \ $(OBJS)\monodll_fdrepdlg.o \ $(OBJS)\monodll_filedlgg.o \ @@ -1430,6 +1429,7 @@ endif ifeq ($(WXUNIV),0) ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.o \ + $(OBJS)\monodll_datectlg.o \ $(OBJS)\monodll_grid.o \ $(OBJS)\monodll_gridctrl.o \ $(OBJS)\monodll_gridsel.o \ @@ -1448,6 +1448,7 @@ endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.o \ + $(OBJS)\monodll_datectlg.o \ $(OBJS)\monodll_grid.o \ $(OBJS)\monodll_gridctrl.o \ $(OBJS)\monodll_gridsel.o \ @@ -1789,7 +1790,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_accel.o \ $(OBJS)\monolib_colrdlgg.o \ - $(OBJS)\monolib_datectlg.o \ $(OBJS)\monolib_dirdlgg.o \ $(OBJS)\monolib_fdrepdlg.o \ $(OBJS)\monolib_filedlgg.o \ @@ -1938,6 +1938,7 @@ endif ifeq ($(WXUNIV),0) ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.o \ + $(OBJS)\monolib_datectlg.o \ $(OBJS)\monolib_grid.o \ $(OBJS)\monolib_gridctrl.o \ $(OBJS)\monolib_gridsel.o \ @@ -1956,6 +1957,7 @@ endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.o \ + $(OBJS)\monolib_datectlg.o \ $(OBJS)\monolib_grid.o \ $(OBJS)\monolib_gridctrl.o \ $(OBJS)\monolib_gridsel.o \ @@ -2252,7 +2254,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_accel.o \ $(OBJS)\coredll_colrdlgg.o \ - $(OBJS)\coredll_datectlg.o \ $(OBJS)\coredll_dirdlgg.o \ $(OBJS)\coredll_fdrepdlg.o \ $(OBJS)\coredll_filedlgg.o \ @@ -2656,7 +2657,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_accel.o \ $(OBJS)\corelib_colrdlgg.o \ - $(OBJS)\corelib_datectlg.o \ $(OBJS)\corelib_dirdlgg.o \ $(OBJS)\corelib_fdrepdlg.o \ $(OBJS)\corelib_filedlgg.o \ @@ -2813,6 +2813,7 @@ endif ifeq ($(WXUNIV),0) ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.o \ + $(OBJS)\advdll_datectlg.o \ $(OBJS)\advdll_grid.o \ $(OBJS)\advdll_gridctrl.o \ $(OBJS)\advdll_gridsel.o \ @@ -2831,6 +2832,7 @@ endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.o \ + $(OBJS)\advdll_datectlg.o \ $(OBJS)\advdll_grid.o \ $(OBJS)\advdll_gridctrl.o \ $(OBJS)\advdll_gridsel.o \ @@ -2856,6 +2858,7 @@ endif ifeq ($(WXUNIV),0) ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.o \ + $(OBJS)\advlib_datectlg.o \ $(OBJS)\advlib_grid.o \ $(OBJS)\advlib_gridctrl.o \ $(OBJS)\advlib_gridsel.o \ @@ -2874,6 +2877,7 @@ endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.o \ + $(OBJS)\advlib_datectlg.o \ $(OBJS)\advlib_grid.o \ $(OBJS)\advlib_gridctrl.o \ $(OBJS)\advlib_gridsel.o \ @@ -4142,9 +4146,6 @@ $(OBJS)\monodll_fontdlg.o: ../../src/msw/fontdlg.cpp $(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_dirdlgg.o: ../../src/generic/dirdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -5498,6 +5499,11 @@ $(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -5902,9 +5908,6 @@ $(OBJS)\monolib_fontdlg.o: ../../src/msw/fontdlg.cpp $(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_dirdlgg.o: ../../src/generic/dirdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -7258,6 +7261,11 @@ $(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -7962,9 +7970,6 @@ $(OBJS)\coredll_fontdlg.o: ../../src/msw/fontdlg.cpp $(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_dirdlgg.o: ../../src/generic/dirdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9199,9 +9204,6 @@ $(OBJS)\corelib_fontdlg.o: ../../src/msw/fontdlg.cpp $(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_dirdlgg.o: ../../src/generic/dirdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10352,6 +10354,9 @@ $(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -10400,6 +10405,9 @@ $(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index d4742871dd..b1ee9e0fe5 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1494,7 +1494,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_colrdlgg.obj \ - $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_dirdlgg.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_filedlgg.obj \ @@ -1642,6 +1641,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -1660,6 +1660,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -2014,7 +2015,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_colrdlgg.obj \ - $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_dirdlgg.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_filedlgg.obj \ @@ -2162,6 +2162,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -2180,6 +2181,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -2551,7 +2553,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_colrdlgg.obj \ - $(OBJS)\coredll_datectlg.obj \ $(OBJS)\coredll_dirdlgg.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_filedlgg.obj \ @@ -2965,7 +2966,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_colrdlgg.obj \ - $(OBJS)\corelib_datectlg.obj \ $(OBJS)\corelib_dirdlgg.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_filedlgg.obj \ @@ -3135,6 +3135,7 @@ __DEBUGRUNTIME_176 = $(__DEBUGINFO_3_0) !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datectlg.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -3153,6 +3154,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datectlg.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -3192,6 +3194,7 @@ __DEBUGRUNTIME_188 = $(__DEBUGINFO_3_0) !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datectlg.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -3210,6 +3213,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datectlg.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -4696,9 +4700,6 @@ $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5952,6 +5953,11 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6356,9 +6362,6 @@ $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7612,6 +7615,11 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8316,9 +8324,6 @@ $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** - $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -9453,9 +9458,6 @@ $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** - $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -10506,6 +10508,9 @@ $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** @@ -10554,6 +10559,9 @@ $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 6739d899fa..07e8580eee 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -418,7 +418,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_accel.obj & $(OBJS)\monodll_colrdlgg.obj & - $(OBJS)\monodll_datectlg.obj & $(OBJS)\monodll_dirdlgg.obj & $(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_filedlgg.obj & @@ -568,6 +567,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_calctrl.obj & + $(OBJS)\monodll_datectlg.obj & $(OBJS)\monodll_grid.obj & $(OBJS)\monodll_gridctrl.obj & $(OBJS)\monodll_gridsel.obj & @@ -586,6 +586,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_calctrl.obj & + $(OBJS)\monodll_datectlg.obj & $(OBJS)\monodll_grid.obj & $(OBJS)\monodll_gridctrl.obj & $(OBJS)\monodll_gridsel.obj & @@ -930,7 +931,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_accel.obj & $(OBJS)\monolib_colrdlgg.obj & - $(OBJS)\monolib_datectlg.obj & $(OBJS)\monolib_dirdlgg.obj & $(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_filedlgg.obj & @@ -1080,6 +1080,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_calctrl.obj & + $(OBJS)\monolib_datectlg.obj & $(OBJS)\monolib_grid.obj & $(OBJS)\monolib_gridctrl.obj & $(OBJS)\monolib_gridsel.obj & @@ -1098,6 +1099,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_calctrl.obj & + $(OBJS)\monolib_datectlg.obj & $(OBJS)\monolib_grid.obj & $(OBJS)\monolib_gridctrl.obj & $(OBJS)\monolib_gridsel.obj & @@ -1400,7 +1402,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_accel.obj & $(OBJS)\coredll_colrdlgg.obj & - $(OBJS)\coredll_datectlg.obj & $(OBJS)\coredll_dirdlgg.obj & $(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_filedlgg.obj & @@ -1806,7 +1807,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_accel.obj & $(OBJS)\corelib_colrdlgg.obj & - $(OBJS)\corelib_datectlg.obj & $(OBJS)\corelib_dirdlgg.obj & $(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_filedlgg.obj & @@ -1965,6 +1965,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_calctrl.obj & + $(OBJS)\advdll_datectlg.obj & $(OBJS)\advdll_grid.obj & $(OBJS)\advdll_gridctrl.obj & $(OBJS)\advdll_gridsel.obj & @@ -1983,6 +1984,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_calctrl.obj & + $(OBJS)\advdll_datectlg.obj & $(OBJS)\advdll_grid.obj & $(OBJS)\advdll_gridctrl.obj & $(OBJS)\advdll_gridsel.obj & @@ -2010,6 +2012,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_calctrl.obj & + $(OBJS)\advlib_datectlg.obj & $(OBJS)\advlib_grid.obj & $(OBJS)\advlib_gridctrl.obj & $(OBJS)\advlib_gridsel.obj & @@ -2028,6 +2031,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_calctrl.obj & + $(OBJS)\advlib_datectlg.obj & $(OBJS)\advlib_grid.obj & $(OBJS)\advlib_gridctrl.obj & $(OBJS)\advlib_gridsel.obj & @@ -4382,9 +4386,6 @@ $(OBJS)\monodll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp $(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5738,6 +5739,11 @@ $(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6142,9 +6148,6 @@ $(OBJS)\monolib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp $(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7498,6 +7501,11 @@ $(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8202,9 +8210,6 @@ $(OBJS)\coredll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp $(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9439,9 +9444,6 @@ $(OBJS)\corelib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp $(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10592,6 +10594,9 @@ $(OBJS)\advdll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -10640,6 +10645,9 @@ $(OBJS)\advlib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 62b8457cef..ea998a126f 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -549,6 +549,10 @@ SOURCE=..\..\src\generic\calctrl.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\datectlg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\grid.cpp # End Source File # Begin Source File @@ -784,6 +788,10 @@ SOURCE=..\..\include\wx\generic\calctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\datectrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\grid.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index ace004a907..3f3700cf88 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -3998,69 +3998,6 @@ SOURCE=..\..\src\generic\colrdlgg.cpp !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 - -SOURCE=..\..\src\generic\datectlg.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 @@ -7710,6 +7647,10 @@ SOURCE=..\..\include\wx\generic\colrdlgg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\datectrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\dcpsg.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 8ed2f7d6cf..a8ed4caa0a 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -914,6 +914,10 @@ SOURCE=.\generic\choicdgg.cpp # End Source File # Begin Source File +SOURCE=.\generic\datectlg.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\dcpsg.cpp # End Source File # Begin Source File @@ -3627,6 +3631,10 @@ SOURCE=..\include\wx\generic\colrdlgg.h # End Source File # Begin Source File +SOURCE=..\include\wx\generic\datectrl.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\generic\dcpsg.h # End Source File # Begin Source File -- 2.45.2