From f0da6aa0aeb38fdb8fc4cebc6ab6966be9ee10df Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 8 Feb 2016 01:00:57 +0100 Subject: [PATCH] Allow using wxCollapsibleHeaderCtrl in wxGTK too The implementation file for this control somehow wasn't used in wxGTK build, fix this and, in fact, include it in common sources as there is only a generic implementation of this control so far. Closes #17309. --- Makefile.in | 153 ++++++++------------------------------ build/bakefiles/files.bkl | 8 +- build/files | 8 +- build/msw/makefile.bcc | 56 +++++++------- build/msw/makefile.gcc | 56 +++++++------- build/msw/makefile.vc | 56 +++++++------- 6 files changed, 118 insertions(+), 219 deletions(-) diff --git a/Makefile.in b/Makefile.in index 77364c69a0..1b6b9c5504 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3208,7 +3208,6 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/toplevel.h \ wx/msw/treectrl.h \ wx/msw/window.h \ - wx/generic/collheaderctrl.h \ wx/msw/checklst.h \ wx/msw/fdrepdlg.h \ wx/msw/fontdlg.h \ @@ -4520,6 +4519,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_generic_buttonbar.o \ monodll_choicdgg.o \ monodll_choicbkg.o \ + monodll_collheaderctrlg.o \ monodll_combog.o \ monodll_dcpsg.o \ monodll_dirctrlg.o \ @@ -4607,7 +4607,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_univ_toolbar.o \ monodll_topluniv.o \ monodll_winuniv.o \ - monodll_collheaderctrlg.o \ monodll_gtk.o \ monodll_metal.o \ monodll_mono.o \ @@ -4744,6 +4743,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_generic_buttonbar.o \ monodll_choicdgg.o \ monodll_choicbkg.o \ + monodll_collheaderctrlg.o \ monodll_combog.o \ monodll_dcpsg.o \ monodll_dirctrlg.o \ @@ -5221,8 +5221,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_paletteg.o \ monodll_regiong.o \ monodll_generic_statusbr.o \ - monodll_generic_textmeasure.o \ - monodll_collheaderctrlg.o + monodll_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ @@ -5268,8 +5267,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_gtk1_stattext.o \ monodll_gtk1_toolbar.o \ monodll_gtk1_textctrl.o \ - monodll_gtk1_tglbtn.o \ - monodll_collheaderctrlg.o + monodll_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ @@ -5447,8 +5445,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_prntdlgg.o \ monodll_generic_statline.o \ monodll_generic_statusbr.o \ - monodll_tabg.o \ - monodll_collheaderctrlg.o + monodll_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_clrpickerg.o \ @@ -5511,7 +5508,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_msw_tglbtn.o \ monodll_treectrl.o \ monodll_systhemectrl.o \ - monodll_collheaderctrlg.o \ monodll_msw_checklst.o \ monodll_msw_fdrepdlg.o \ monodll_msw_fontdlg.o @@ -6614,6 +6610,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_generic_buttonbar.o \ monolib_choicdgg.o \ monolib_choicbkg.o \ + monolib_collheaderctrlg.o \ monolib_combog.o \ monolib_dcpsg.o \ monolib_dirctrlg.o \ @@ -6701,7 +6698,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_univ_toolbar.o \ monolib_topluniv.o \ monolib_winuniv.o \ - monolib_collheaderctrlg.o \ monolib_gtk.o \ monolib_metal.o \ monolib_mono.o \ @@ -6838,6 +6834,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_generic_buttonbar.o \ monolib_choicdgg.o \ monolib_choicbkg.o \ + monolib_collheaderctrlg.o \ monolib_combog.o \ monolib_dcpsg.o \ monolib_dirctrlg.o \ @@ -7315,8 +7312,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_paletteg.o \ monolib_regiong.o \ monolib_generic_statusbr.o \ - monolib_generic_textmeasure.o \ - monolib_collheaderctrlg.o + monolib_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ @@ -7362,8 +7358,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_gtk1_stattext.o \ monolib_gtk1_toolbar.o \ monolib_gtk1_textctrl.o \ - monolib_gtk1_tglbtn.o \ - monolib_collheaderctrlg.o + monolib_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ @@ -7541,8 +7536,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_prntdlgg.o \ monolib_generic_statline.o \ monolib_generic_statusbr.o \ - monolib_tabg.o \ - monolib_collheaderctrlg.o + monolib_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_clrpickerg.o \ @@ -7605,7 +7599,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_msw_tglbtn.o \ monolib_treectrl.o \ monolib_systhemectrl.o \ - monolib_collheaderctrlg.o \ monolib_msw_checklst.o \ monolib_msw_fdrepdlg.o \ monolib_msw_fontdlg.o @@ -8851,6 +8844,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_buttonbar.o \ coredll_choicdgg.o \ coredll_choicbkg.o \ + coredll_collheaderctrlg.o \ coredll_combog.o \ coredll_dcpsg.o \ coredll_dirctrlg.o \ @@ -8938,7 +8932,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_univ_toolbar.o \ coredll_topluniv.o \ coredll_winuniv.o \ - coredll_collheaderctrlg.o \ coredll_gtk.o \ coredll_metal.o \ coredll_mono.o \ @@ -9075,6 +9068,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_buttonbar.o \ coredll_choicdgg.o \ coredll_choicbkg.o \ + coredll_collheaderctrlg.o \ coredll_combog.o \ coredll_dcpsg.o \ coredll_dirctrlg.o \ @@ -9552,8 +9546,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_paletteg.o \ coredll_regiong.o \ coredll_generic_statusbr.o \ - coredll_generic_textmeasure.o \ - coredll_collheaderctrlg.o + coredll_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ @@ -9599,8 +9592,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_gtk1_stattext.o \ coredll_gtk1_toolbar.o \ coredll_gtk1_textctrl.o \ - coredll_gtk1_tglbtn.o \ - coredll_collheaderctrlg.o + coredll_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ @@ -9778,8 +9770,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_prntdlgg.o \ coredll_generic_statline.o \ coredll_generic_statusbr.o \ - coredll_tabg.o \ - coredll_collheaderctrlg.o + coredll_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_clrpickerg.o \ @@ -9842,7 +9833,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_msw_tglbtn.o \ coredll_treectrl.o \ coredll_systhemectrl.o \ - coredll_collheaderctrlg.o \ coredll_msw_checklst.o \ coredll_msw_fdrepdlg.o \ coredll_msw_fontdlg.o @@ -10416,6 +10406,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_buttonbar.o \ corelib_choicdgg.o \ corelib_choicbkg.o \ + corelib_collheaderctrlg.o \ corelib_combog.o \ corelib_dcpsg.o \ corelib_dirctrlg.o \ @@ -10503,7 +10494,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_univ_toolbar.o \ corelib_topluniv.o \ corelib_winuniv.o \ - corelib_collheaderctrlg.o \ corelib_gtk.o \ corelib_metal.o \ corelib_mono.o \ @@ -10640,6 +10630,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_buttonbar.o \ corelib_choicdgg.o \ corelib_choicbkg.o \ + corelib_collheaderctrlg.o \ corelib_combog.o \ corelib_dcpsg.o \ corelib_dirctrlg.o \ @@ -11117,8 +11108,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_paletteg.o \ corelib_regiong.o \ corelib_generic_statusbr.o \ - corelib_generic_textmeasure.o \ - corelib_collheaderctrlg.o + corelib_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ @@ -11164,8 +11154,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_gtk1_stattext.o \ corelib_gtk1_toolbar.o \ corelib_gtk1_textctrl.o \ - corelib_gtk1_tglbtn.o \ - corelib_collheaderctrlg.o + corelib_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ @@ -11343,8 +11332,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_prntdlgg.o \ corelib_generic_statline.o \ corelib_generic_statusbr.o \ - corelib_tabg.o \ - corelib_collheaderctrlg.o + corelib_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_clrpickerg.o \ @@ -11407,7 +11395,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_msw_tglbtn.o \ corelib_treectrl.o \ corelib_systhemectrl.o \ - corelib_collheaderctrlg.o \ corelib_msw_checklst.o \ corelib_msw_fdrepdlg.o \ corelib_msw_fontdlg.o @@ -13638,7 +13625,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \ monodll_utilscocoa.o \ monodll_generic_caret.o \ monodll_clrpickerg.o \ - monodll_collheaderctrlg.o \ monodll_collpaneg.o \ monodll_colrdlgg.o \ monodll_dirdlgg.o \ @@ -13784,7 +13770,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \ monolib_utilscocoa.o \ monolib_generic_caret.o \ monolib_clrpickerg.o \ - monolib_collheaderctrlg.o \ monolib_collpaneg.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ @@ -13930,7 +13915,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \ coredll_utilscocoa.o \ coredll_generic_caret.o \ coredll_clrpickerg.o \ - coredll_collheaderctrlg.o \ coredll_collpaneg.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ @@ -14061,7 +14045,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \ corelib_utilscocoa.o \ corelib_generic_caret.o \ corelib_clrpickerg.o \ - corelib_collheaderctrlg.o \ corelib_collpaneg.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ @@ -19755,27 +19738,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -20511,6 +20473,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp +@COND_USE_GUI_1@monodll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp + @COND_USE_GUI_1@monodll_combog.o: $(srcdir)/src/generic/combog.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp @@ -24849,27 +24814,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -25605,6 +25549,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp +@COND_USE_GUI_1@monolib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp + @COND_USE_GUI_1@monolib_combog.o: $(srcdir)/src/generic/combog.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp @@ -29997,27 +29944,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -30753,6 +30679,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp +@COND_USE_GUI_1@coredll_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp + @COND_USE_GUI_1@coredll_combog.o: $(srcdir)/src/generic/combog.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp @@ -33678,27 +33607,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - -@COND_USE_GUI_1_WXUNIV_1@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -34434,6 +34342,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp +@COND_USE_GUI_1@corelib_collheaderctrlg.o: $(srcdir)/src/generic/collheaderctrlg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collheaderctrlg.cpp + @COND_USE_GUI_1@corelib_combog.o: $(srcdir)/src/generic/combog.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index d2c88a01d8..0e3b454793 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -908,6 +908,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/buttonbar.cpp src/generic/choicdgg.cpp src/generic/choicbkg.cpp + src/generic/collheaderctrlg.cpp src/generic/combog.cpp src/generic/dcpsg.cpp src/generic/dirctrlg.cpp @@ -1550,7 +1551,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/toolbar.cpp src/gtk1/textctrl.cpp src/gtk1/tglbtn.cpp - src/generic/collheaderctrlg.cpp wx/generic/clrpickerg.h @@ -1692,7 +1692,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/statline.cpp src/generic/statusbr.cpp src/generic/tabg.cpp - src/generic/collheaderctrlg.cpp wx/generic/clrpickerg.h @@ -1978,7 +1977,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/tglbtn.cpp src/msw/treectrl.cpp src/msw/systhemectrl.cpp - src/generic/collheaderctrlg.cpp wx/generic/clrpickerg.h @@ -2076,7 +2074,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/toplevel.h wx/msw/treectrl.h wx/msw/window.h - wx/generic/collheaderctrl.h @@ -2293,7 +2290,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/caret.cpp src/generic/clrpickerg.cpp - src/generic/collheaderctrlg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp src/generic/dirdlgg.cpp @@ -2593,7 +2589,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/regiong.cpp src/generic/statusbr.cpp src/generic/textmeasure.cpp - src/generic/collheaderctrlg.cpp wx/cocoa/NSApplication.h @@ -2760,7 +2755,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/univ/toolbar.cpp src/univ/topluniv.cpp src/univ/winuniv.cpp - src/generic/collheaderctrlg.cpp $(UNIV_PLATFORM_HDR) diff --git a/build/files b/build/files index 7834c73307..04e035926e 100644 --- a/build/files +++ b/build/files @@ -620,6 +620,7 @@ GUI_CMN_SRC = src/generic/buttonbar.cpp src/generic/choicdgg.cpp src/generic/choicbkg.cpp + src/generic/collheaderctrlg.cpp src/generic/combog.cpp src/generic/dcpsg.cpp src/generic/dirctrlg.cpp @@ -1186,7 +1187,6 @@ GTK1_SRC = # Generic implementations used by wxGTK1: src/generic/accel.cpp src/generic/clrpickerg.cpp - src/generic/collheaderctrlg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp src/generic/dirdlgg.cpp @@ -1351,7 +1351,6 @@ MOTIF_SRC = src/motif/xmcombo/xmcombo.c # Generic files used by wxMotif: src/generic/clrpickerg.cpp - src/generic/collheaderctrlg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp src/generic/dirdlgg.cpp @@ -1579,7 +1578,6 @@ MSW_DESKTOP_LOWLEVEL_HDR = MSW_SRC = src/generic/clrpickerg.cpp - src/generic/collheaderctrlg.cpp src/generic/collpaneg.cpp src/generic/filepickerg.cpp src/generic/fontpickerg.cpp @@ -1641,7 +1639,6 @@ MSW_SRC = src/msw/treectrl.cpp MSW_HDR = wx/generic/clrpickerg.h - wx/generic/collheaderctrl.h wx/generic/collpaneg.h wx/generic/filepickerg.h wx/generic/fontpickerg.h @@ -1938,7 +1935,6 @@ OSX_COMMON_SRC = # Generic implementations used by wxOSX: src/generic/caret.cpp src/generic/clrpickerg.cpp - src/generic/collheaderctrlg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp src/generic/dirdlgg.cpp @@ -2212,7 +2208,6 @@ COCOA_SRC = src/generic/accel.cpp src/generic/caret.cpp src/generic/clrpickerg.cpp - src/generic/collheaderctrlg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp src/generic/fdrepdlg.cpp @@ -2327,7 +2322,6 @@ UNIV_SRC = $(UNIV_PLATFORM_SRC) src/generic/accel.cpp src/generic/clrpickerg.cpp - src/generic/collheaderctrlg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp src/generic/dirdlgg.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index c9b4aff18c..743da82751 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1888,7 +1888,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_systhemectrl.obj \ - $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_msw_checklst.obj \ $(OBJS)\monodll_msw_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ @@ -2024,6 +2023,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ + $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ @@ -2165,7 +2165,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_univ_toolbar.obj \ $(OBJS)\monodll_topluniv.obj \ $(OBJS)\monodll_winuniv.obj \ - $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_gtk.obj \ $(OBJS)\monodll_metal.obj \ $(OBJS)\monodll_mono.obj \ @@ -2302,6 +2301,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ + $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ @@ -2710,7 +2710,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_systhemectrl.obj \ - $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_msw_checklst.obj \ $(OBJS)\monolib_msw_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ @@ -2846,6 +2845,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ + $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ @@ -2987,7 +2987,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_univ_toolbar.obj \ $(OBJS)\monolib_topluniv.obj \ $(OBJS)\monolib_winuniv.obj \ - $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_gtk.obj \ $(OBJS)\monolib_metal.obj \ $(OBJS)\monolib_mono.obj \ @@ -3124,6 +3123,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ + $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ @@ -3405,7 +3405,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_systhemectrl.obj \ - $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_msw_checklst.obj \ $(OBJS)\coredll_msw_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ @@ -3541,6 +3540,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ + $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ @@ -3682,7 +3682,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_univ_toolbar.obj \ $(OBJS)\coredll_topluniv.obj \ $(OBJS)\coredll_winuniv.obj \ - $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_gtk.obj \ $(OBJS)\coredll_metal.obj \ $(OBJS)\coredll_mono.obj \ @@ -3819,6 +3818,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ + $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ @@ -3973,7 +3973,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_systhemectrl.obj \ - $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_msw_checklst.obj \ $(OBJS)\corelib_msw_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ @@ -4109,6 +4108,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ + $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ @@ -4250,7 +4250,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_univ_toolbar.obj \ $(OBJS)\corelib_topluniv.obj \ $(OBJS)\corelib_winuniv.obj \ - $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_gtk.obj \ $(OBJS)\corelib_metal.obj \ $(OBJS)\corelib_mono.obj \ @@ -4387,6 +4386,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ + $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ @@ -7806,11 +7806,6 @@ $(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -8471,6 +8466,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp @@ -10316,11 +10316,6 @@ $(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -10981,6 +10976,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp @@ -12760,11 +12760,6 @@ $(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -13425,6 +13420,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp @@ -14229,11 +14229,6 @@ $(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -14894,6 +14889,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 09144effa3..f51f1d2274 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1907,7 +1907,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_tglbtn.o \ $(OBJS)\monodll_treectrl.o \ $(OBJS)\monodll_systhemectrl.o \ - $(OBJS)\monodll_collheaderctrlg.o \ $(OBJS)\monodll_msw_checklst.o \ $(OBJS)\monodll_msw_fdrepdlg.o \ $(OBJS)\monodll_fontdlg.o \ @@ -2043,6 +2042,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_buttonbar.o \ $(OBJS)\monodll_choicdgg.o \ $(OBJS)\monodll_choicbkg.o \ + $(OBJS)\monodll_collheaderctrlg.o \ $(OBJS)\monodll_combog.o \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ @@ -2186,7 +2186,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_univ_toolbar.o \ $(OBJS)\monodll_topluniv.o \ $(OBJS)\monodll_winuniv.o \ - $(OBJS)\monodll_collheaderctrlg.o \ $(OBJS)\monodll_gtk.o \ $(OBJS)\monodll_metal.o \ $(OBJS)\monodll_mono.o \ @@ -2323,6 +2322,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_buttonbar.o \ $(OBJS)\monodll_choicdgg.o \ $(OBJS)\monodll_choicbkg.o \ + $(OBJS)\monodll_collheaderctrlg.o \ $(OBJS)\monodll_combog.o \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ @@ -2735,7 +2735,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_tglbtn.o \ $(OBJS)\monolib_treectrl.o \ $(OBJS)\monolib_systhemectrl.o \ - $(OBJS)\monolib_collheaderctrlg.o \ $(OBJS)\monolib_msw_checklst.o \ $(OBJS)\monolib_msw_fdrepdlg.o \ $(OBJS)\monolib_fontdlg.o \ @@ -2871,6 +2870,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_buttonbar.o \ $(OBJS)\monolib_choicdgg.o \ $(OBJS)\monolib_choicbkg.o \ + $(OBJS)\monolib_collheaderctrlg.o \ $(OBJS)\monolib_combog.o \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ @@ -3014,7 +3014,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_univ_toolbar.o \ $(OBJS)\monolib_topluniv.o \ $(OBJS)\monolib_winuniv.o \ - $(OBJS)\monolib_collheaderctrlg.o \ $(OBJS)\monolib_gtk.o \ $(OBJS)\monolib_metal.o \ $(OBJS)\monolib_mono.o \ @@ -3151,6 +3150,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_buttonbar.o \ $(OBJS)\monolib_choicdgg.o \ $(OBJS)\monolib_choicbkg.o \ + $(OBJS)\monolib_collheaderctrlg.o \ $(OBJS)\monolib_combog.o \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ @@ -3446,7 +3446,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_tglbtn.o \ $(OBJS)\coredll_treectrl.o \ $(OBJS)\coredll_systhemectrl.o \ - $(OBJS)\coredll_collheaderctrlg.o \ $(OBJS)\coredll_msw_checklst.o \ $(OBJS)\coredll_msw_fdrepdlg.o \ $(OBJS)\coredll_fontdlg.o \ @@ -3582,6 +3581,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_buttonbar.o \ $(OBJS)\coredll_choicdgg.o \ $(OBJS)\coredll_choicbkg.o \ + $(OBJS)\coredll_collheaderctrlg.o \ $(OBJS)\coredll_combog.o \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ @@ -3725,7 +3725,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_univ_toolbar.o \ $(OBJS)\coredll_topluniv.o \ $(OBJS)\coredll_winuniv.o \ - $(OBJS)\coredll_collheaderctrlg.o \ $(OBJS)\coredll_gtk.o \ $(OBJS)\coredll_metal.o \ $(OBJS)\coredll_mono.o \ @@ -3862,6 +3861,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_buttonbar.o \ $(OBJS)\coredll_choicdgg.o \ $(OBJS)\coredll_choicbkg.o \ + $(OBJS)\coredll_collheaderctrlg.o \ $(OBJS)\coredll_combog.o \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ @@ -4022,7 +4022,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_tglbtn.o \ $(OBJS)\corelib_treectrl.o \ $(OBJS)\corelib_systhemectrl.o \ - $(OBJS)\corelib_collheaderctrlg.o \ $(OBJS)\corelib_msw_checklst.o \ $(OBJS)\corelib_msw_fdrepdlg.o \ $(OBJS)\corelib_fontdlg.o \ @@ -4158,6 +4157,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_buttonbar.o \ $(OBJS)\corelib_choicdgg.o \ $(OBJS)\corelib_choicbkg.o \ + $(OBJS)\corelib_collheaderctrlg.o \ $(OBJS)\corelib_combog.o \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ @@ -4301,7 +4301,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_univ_toolbar.o \ $(OBJS)\corelib_topluniv.o \ $(OBJS)\corelib_winuniv.o \ - $(OBJS)\corelib_collheaderctrlg.o \ $(OBJS)\corelib_gtk.o \ $(OBJS)\corelib_metal.o \ $(OBJS)\corelib_mono.o \ @@ -4438,6 +4437,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_buttonbar.o \ $(OBJS)\corelib_choicdgg.o \ $(OBJS)\corelib_choicbkg.o \ + $(OBJS)\corelib_collheaderctrlg.o \ $(OBJS)\corelib_combog.o \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ @@ -7981,11 +7981,6 @@ $(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8646,6 +8641,11 @@ $(OBJS)\monodll_choicbkg.o: ../../src/generic/choicbkg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_combog.o: ../../src/generic/combog.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -10491,11 +10491,6 @@ $(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -11156,6 +11151,11 @@ $(OBJS)\monolib_choicbkg.o: ../../src/generic/choicbkg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_combog.o: ../../src/generic/combog.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -12935,11 +12935,6 @@ $(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13600,6 +13595,11 @@ $(OBJS)\coredll_choicbkg.o: ../../src/generic/choicbkg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_combog.o: ../../src/generic/combog.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14404,11 +14404,6 @@ $(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -15069,6 +15064,11 @@ $(OBJS)\corelib_choicbkg.o: ../../src/generic/choicbkg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_collheaderctrlg.o: ../../src/generic/collheaderctrlg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_combog.o: ../../src/generic/combog.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 050858c066..090f83bcc1 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2188,7 +2188,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_systhemectrl.obj \ - $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_msw_checklst.obj \ $(OBJS)\monodll_msw_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ @@ -2324,6 +2323,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ + $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ @@ -2465,7 +2465,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_univ_toolbar.obj \ $(OBJS)\monodll_topluniv.obj \ $(OBJS)\monodll_winuniv.obj \ - $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_gtk.obj \ $(OBJS)\monodll_metal.obj \ $(OBJS)\monodll_mono.obj \ @@ -2602,6 +2601,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ + $(OBJS)\monodll_collheaderctrlg.obj \ $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ @@ -3016,7 +3016,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_systhemectrl.obj \ - $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_msw_checklst.obj \ $(OBJS)\monolib_msw_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ @@ -3152,6 +3151,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ + $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ @@ -3293,7 +3293,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_univ_toolbar.obj \ $(OBJS)\monolib_topluniv.obj \ $(OBJS)\monolib_winuniv.obj \ - $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_gtk.obj \ $(OBJS)\monolib_metal.obj \ $(OBJS)\monolib_mono.obj \ @@ -3430,6 +3429,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ + $(OBJS)\monolib_collheaderctrlg.obj \ $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ @@ -3777,7 +3777,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_systhemectrl.obj \ - $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_msw_checklst.obj \ $(OBJS)\coredll_msw_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ @@ -3913,6 +3912,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ + $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ @@ -4054,7 +4054,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_univ_toolbar.obj \ $(OBJS)\coredll_topluniv.obj \ $(OBJS)\coredll_winuniv.obj \ - $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_gtk.obj \ $(OBJS)\coredll_metal.obj \ $(OBJS)\coredll_mono.obj \ @@ -4191,6 +4190,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ + $(OBJS)\coredll_collheaderctrlg.obj \ $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ @@ -4351,7 +4351,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_systhemectrl.obj \ - $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_msw_checklst.obj \ $(OBJS)\corelib_msw_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ @@ -4487,6 +4486,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ + $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ @@ -4628,7 +4628,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_univ_toolbar.obj \ $(OBJS)\corelib_topluniv.obj \ $(OBJS)\corelib_winuniv.obj \ - $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_gtk.obj \ $(OBJS)\corelib_metal.obj \ $(OBJS)\corelib_mono.obj \ @@ -4765,6 +4764,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ + $(OBJS)\corelib_collheaderctrlg.obj \ $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ @@ -8498,11 +8498,6 @@ $(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -9163,6 +9158,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp @@ -11008,11 +11008,6 @@ $(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -11673,6 +11668,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp @@ -13452,11 +13452,6 @@ $(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -14117,6 +14112,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp @@ -14921,11 +14921,6 @@ $(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp @@ -15586,6 +15581,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp