From 084ad0c2424aa998a640c151f8fa762435364449 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 23 Oct 2006 09:58:29 +0000 Subject: [PATCH] Rebaked makefiles after htmllistbox and collapsable panel additions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 81 ++++++++++++++++++++++++++++++++++++++++++ build/msw/makefile.bcc | 32 +++++++++++++++++ build/msw/makefile.gcc | 32 +++++++++++++++++ build/msw/makefile.vc | 32 +++++++++++++++++ build/msw/makefile.wat | 32 +++++++++++++++++ build/msw/wx_core.dsp | 67 ++++++++++++++++++++++++++++++++++ build/msw/wx_xrc.dsp | 8 +++++ src/wxWindows.dsp | 12 +++++++ 8 files changed, 296 insertions(+) diff --git a/Makefile.in b/Makefile.in index 928a3ed549..49a259b869 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1297,6 +1297,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_radbx.o \ xrcdll_xh_scrol.o \ xrcdll_xh_scwin.o \ + xrcdll_xh_htmllbox.o \ xrcdll_xh_sizer.o \ xrcdll_xh_slidr.o \ xrcdll_xh_spin.o \ @@ -1356,6 +1357,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_radbx.o \ xrclib_xh_scrol.o \ xrclib_xh_scwin.o \ + xrclib_xh_htmllbox.o \ xrclib_xh_sizer.o \ xrclib_xh_slidr.o \ xrclib_xh_spin.o \ @@ -3013,6 +3015,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_radbx.h \ wx/xrc/xh_scrol.h \ wx/xrc/xh_scwin.h \ + wx/xrc/xh_htmllbox.h \ wx/xrc/xh_sizer.h \ wx/xrc/xh_slidr.h \ wx/xrc/xh_spin.h \ @@ -3316,6 +3319,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_radbx.o \ monodll_xh_scrol.o \ monodll_xh_scwin.o \ + monodll_xh_htmllbox.o \ monodll_xh_sizer.o \ monodll_xh_slidr.o \ monodll_xh_spin.o \ @@ -4062,6 +4066,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ @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_accel.o \ + monodll_collpaneg.o \ monodll_colrdlgg.o \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ @@ -4080,6 +4085,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_checklst.o \ monodll_choice.o \ monodll_colordlg.o \ + monodll_collpane.o \ monodll_combobox.o \ monodll_control.o \ monodll_clrpicker.o \ @@ -4266,6 +4272,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ + monodll_collpaneg.o \ monodll_statusbr.o \ monodll_prntdlgg.o \ monodll_accel.o \ @@ -4397,6 +4404,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ + monodll_collpaneg.o \ monodll_statusbr.o \ monodll_prntdlgg.o \ monodll_accel.o \ @@ -5057,6 +5065,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_radbx.o \ monolib_xh_scrol.o \ monolib_xh_scwin.o \ + monolib_xh_htmllbox.o \ monolib_xh_sizer.o \ monolib_xh_slidr.o \ monolib_xh_spin.o \ @@ -5804,6 +5813,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ @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_accel.o \ + monolib_collpaneg.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ @@ -5822,6 +5832,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_checklst.o \ monolib_choice.o \ monolib_colordlg.o \ + monolib_collpane.o \ monolib_combobox.o \ monolib_control.o \ monolib_clrpicker.o \ @@ -6008,6 +6019,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ 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_collpaneg.o \ monolib_statusbr.o \ monolib_prntdlgg.o \ monolib_accel.o \ @@ -6139,6 +6151,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ + monolib_collpaneg.o \ monolib_statusbr.o \ monolib_prntdlgg.o \ monolib_accel.o \ @@ -7759,6 +7772,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ @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_accel.o \ + coredll_collpaneg.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ @@ -7777,6 +7791,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_checklst.o \ coredll_choice.o \ coredll_colordlg.o \ + coredll_collpane.o \ coredll_combobox.o \ coredll_control.o \ coredll_clrpicker.o \ @@ -7963,6 +7978,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ 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_collpaneg.o \ coredll_statusbr.o \ coredll_prntdlgg.o \ coredll_accel.o \ @@ -8094,6 +8110,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ + coredll_collpaneg.o \ coredll_statusbr.o \ coredll_prntdlgg.o \ coredll_accel.o \ @@ -9186,6 +9203,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ @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_accel.o \ + corelib_collpaneg.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ @@ -9204,6 +9222,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_checklst.o \ corelib_choice.o \ corelib_colordlg.o \ + corelib_collpane.o \ corelib_combobox.o \ corelib_control.o \ corelib_clrpicker.o \ @@ -9390,6 +9409,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ 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_collpaneg.o \ corelib_statusbr.o \ corelib_prntdlgg.o \ corelib_accel.o \ @@ -9521,6 +9541,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ + corelib_collpaneg.o \ corelib_statusbr.o \ corelib_prntdlgg.o \ corelib_accel.o \ @@ -12343,6 +12364,9 @@ monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp +monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp + monodll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp @@ -12718,6 +12742,9 @@ monodll_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONODLL_ODEP) monodll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp +monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp + monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp @@ -14377,6 +14404,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -16390,6 +16426,9 @@ monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp +monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp + monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp @@ -16765,6 +16804,9 @@ monolib_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONOLIB_ODEP) monolib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp +monolib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp + monolib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp @@ -18424,6 +18466,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -21409,6 +21460,9 @@ coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp +coredll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp + coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp @@ -22837,6 +22891,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -24319,6 +24382,9 @@ corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp +corelib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp + corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp @@ -25747,6 +25813,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -28045,6 +28120,9 @@ xrcdll_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(XRCDLL_ODEP) xrcdll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp +xrcdll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp + xrcdll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp @@ -28204,6 +28282,9 @@ xrclib_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(XRCLIB_ODEP) xrclib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp +xrclib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp + xrclib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index b9868696f6..5d209da14f 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -945,6 +945,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_radbx.obj \ $(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scwin.obj \ + $(OBJS)\xrcdll_xh_htmllbox.obj \ $(OBJS)\xrcdll_xh_sizer.obj \ $(OBJS)\xrcdll_xh_slidr.obj \ $(OBJS)\xrcdll_xh_spin.obj \ @@ -1008,6 +1009,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_radbx.obj \ $(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scwin.obj \ + $(OBJS)\xrclib_xh_htmllbox.obj \ $(OBJS)\xrclib_xh_sizer.obj \ $(OBJS)\xrclib_xh_slidr.obj \ $(OBJS)\xrclib_xh_spin.obj \ @@ -1242,6 +1244,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_radbx.obj \ $(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scwin.obj \ + $(OBJS)\monodll_xh_htmllbox.obj \ $(OBJS)\monodll_xh_sizer.obj \ $(OBJS)\monodll_xh_slidr.obj \ $(OBJS)\monodll_xh_spin.obj \ @@ -1326,6 +1329,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ + $(OBJS)\monodll_collpaneg.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ @@ -1842,6 +1846,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_radbx.obj \ $(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scwin.obj \ + $(OBJS)\monolib_xh_htmllbox.obj \ $(OBJS)\monolib_xh_sizer.obj \ $(OBJS)\monolib_xh_slidr.obj \ $(OBJS)\monolib_xh_spin.obj \ @@ -1926,6 +1931,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ + $(OBJS)\monolib_collpaneg.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ @@ -2438,6 +2444,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ + $(OBJS)\coredll_collpaneg.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ @@ -2877,6 +2884,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ + $(OBJS)\corelib_collpaneg.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ @@ -4716,6 +4724,9 @@ $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5064,6 +5075,9 @@ $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6650,6 +6664,9 @@ $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6998,6 +7015,9 @@ $(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8905,6 +8925,9 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10150,6 +10173,9 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11911,6 +11937,9 @@ $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -12073,6 +12102,9 @@ $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 3d2ffc314e..a2d823e268 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -944,6 +944,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_radbx.o \ $(OBJS)\xrcdll_xh_scrol.o \ $(OBJS)\xrcdll_xh_scwin.o \ + $(OBJS)\xrcdll_xh_htmllbox.o \ $(OBJS)\xrcdll_xh_sizer.o \ $(OBJS)\xrcdll_xh_slidr.o \ $(OBJS)\xrcdll_xh_spin.o \ @@ -1007,6 +1008,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_radbx.o \ $(OBJS)\xrclib_xh_scrol.o \ $(OBJS)\xrclib_xh_scwin.o \ + $(OBJS)\xrclib_xh_htmllbox.o \ $(OBJS)\xrclib_xh_sizer.o \ $(OBJS)\xrclib_xh_slidr.o \ $(OBJS)\xrclib_xh_spin.o \ @@ -1251,6 +1253,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_radbx.o \ $(OBJS)\monodll_xh_scrol.o \ $(OBJS)\monodll_xh_scwin.o \ + $(OBJS)\monodll_xh_htmllbox.o \ $(OBJS)\monodll_xh_sizer.o \ $(OBJS)\monodll_xh_slidr.o \ $(OBJS)\monodll_xh_spin.o \ @@ -1336,6 +1339,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpwin.o \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_uuid.o \ + $(OBJS)\monodll_collpaneg.o \ $(OBJS)\monodll_statusbr.o \ $(OBJS)\monodll_prntdlgg.o \ $(OBJS)\monodll_accel.o \ @@ -1857,6 +1861,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_radbx.o \ $(OBJS)\monolib_xh_scrol.o \ $(OBJS)\monolib_xh_scwin.o \ + $(OBJS)\monolib_xh_htmllbox.o \ $(OBJS)\monolib_xh_sizer.o \ $(OBJS)\monolib_xh_slidr.o \ $(OBJS)\monolib_xh_spin.o \ @@ -1942,6 +1947,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpwin.o \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_uuid.o \ + $(OBJS)\monolib_collpaneg.o \ $(OBJS)\monolib_statusbr.o \ $(OBJS)\monolib_prntdlgg.o \ $(OBJS)\monolib_accel.o \ @@ -2470,6 +2476,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpwin.o \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_uuid.o \ + $(OBJS)\coredll_collpaneg.o \ $(OBJS)\coredll_statusbr.o \ $(OBJS)\coredll_prntdlgg.o \ $(OBJS)\coredll_accel.o \ @@ -2917,6 +2924,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpwin.o \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_uuid.o \ + $(OBJS)\corelib_collpaneg.o \ $(OBJS)\corelib_statusbr.o \ $(OBJS)\corelib_prntdlgg.o \ $(OBJS)\corelib_accel.o \ @@ -4833,6 +4841,9 @@ $(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.cpp $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_collpaneg.o: ../../src/generic/collpaneg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -5181,6 +5192,9 @@ $(OBJS)\monodll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(OBJS)\monodll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6867,6 +6881,9 @@ $(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.cpp $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_collpaneg.o: ../../src/generic/collpaneg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7215,6 +7232,9 @@ $(OBJS)\monolib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(OBJS)\monolib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9222,6 +9242,9 @@ $(OBJS)\coredll_mslu.o: ../../src/msw/mslu.cpp $(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_collpaneg.o: ../../src/generic/collpaneg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -10567,6 +10590,9 @@ $(OBJS)\corelib_mslu.o: ../../src/msw/mslu.cpp $(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_collpaneg.o: ../../src/generic/collpaneg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -12428,6 +12454,9 @@ $(OBJS)\xrcdll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(OBJS)\xrcdll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12590,6 +12619,9 @@ $(OBJS)\xrclib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(OBJS)\xrclib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 7747b6ab09..b28256522a 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1025,6 +1025,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_radbx.obj \ $(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scwin.obj \ + $(OBJS)\xrcdll_xh_htmllbox.obj \ $(OBJS)\xrcdll_xh_sizer.obj \ $(OBJS)\xrcdll_xh_slidr.obj \ $(OBJS)\xrcdll_xh_spin.obj \ @@ -1090,6 +1091,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_radbx.obj \ $(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scwin.obj \ + $(OBJS)\xrclib_xh_htmllbox.obj \ $(OBJS)\xrclib_xh_sizer.obj \ $(OBJS)\xrclib_xh_slidr.obj \ $(OBJS)\xrclib_xh_spin.obj \ @@ -1409,6 +1411,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_radbx.obj \ $(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scwin.obj \ + $(OBJS)\monodll_xh_htmllbox.obj \ $(OBJS)\monodll_xh_sizer.obj \ $(OBJS)\monodll_xh_slidr.obj \ $(OBJS)\monodll_xh_spin.obj \ @@ -1493,6 +1496,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ + $(OBJS)\monodll_collpaneg.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ @@ -2015,6 +2019,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_radbx.obj \ $(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scwin.obj \ + $(OBJS)\monolib_xh_htmllbox.obj \ $(OBJS)\monolib_xh_sizer.obj \ $(OBJS)\monolib_xh_slidr.obj \ $(OBJS)\monolib_xh_spin.obj \ @@ -2099,6 +2104,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ + $(OBJS)\monolib_collpaneg.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ @@ -2641,6 +2647,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ + $(OBJS)\coredll_collpaneg.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ @@ -3086,6 +3093,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ + $(OBJS)\corelib_collpaneg.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ @@ -5049,6 +5057,9 @@ $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5397,6 +5408,9 @@ $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6983,6 +6997,9 @@ $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7331,6 +7348,9 @@ $(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -9238,6 +9258,9 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -10483,6 +10506,9 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -12244,6 +12270,9 @@ $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** @@ -12406,6 +12435,9 @@ $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index e467690ec0..5439e20acf 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -168,6 +168,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_radbx.obj & $(OBJS)\monodll_xh_scrol.obj & $(OBJS)\monodll_xh_scwin.obj & + $(OBJS)\monodll_xh_htmllbox.obj & $(OBJS)\monodll_xh_sizer.obj & $(OBJS)\monodll_xh_slidr.obj & $(OBJS)\monodll_xh_spin.obj & @@ -254,6 +255,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_uuid.obj & + $(OBJS)\monodll_collpaneg.obj & $(OBJS)\monodll_statusbr.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_accel.obj & @@ -778,6 +780,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_radbx.obj & $(OBJS)\monolib_xh_scrol.obj & $(OBJS)\monolib_xh_scwin.obj & + $(OBJS)\monolib_xh_htmllbox.obj & $(OBJS)\monolib_xh_sizer.obj & $(OBJS)\monolib_xh_slidr.obj & $(OBJS)\monolib_xh_spin.obj & @@ -864,6 +867,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_uuid.obj & + $(OBJS)\monolib_collpaneg.obj & $(OBJS)\monolib_statusbr.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_accel.obj & @@ -1399,6 +1403,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_uuid.obj & + $(OBJS)\coredll_collpaneg.obj & $(OBJS)\coredll_statusbr.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_accel.obj & @@ -1848,6 +1853,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_uuid.obj & + $(OBJS)\corelib_collpaneg.obj & $(OBJS)\corelib_statusbr.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_accel.obj & @@ -3634,6 +3640,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_radbx.obj & $(OBJS)\xrcdll_xh_scrol.obj & $(OBJS)\xrcdll_xh_scwin.obj & + $(OBJS)\xrcdll_xh_htmllbox.obj & $(OBJS)\xrcdll_xh_sizer.obj & $(OBJS)\xrcdll_xh_slidr.obj & $(OBJS)\xrcdll_xh_spin.obj & @@ -3697,6 +3704,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_radbx.obj & $(OBJS)\xrclib_xh_scrol.obj & $(OBJS)\xrclib_xh_scwin.obj & + $(OBJS)\xrclib_xh_htmllbox.obj & $(OBJS)\xrclib_xh_sizer.obj & $(OBJS)\xrclib_xh_slidr.obj & $(OBJS)\xrclib_xh_spin.obj & @@ -5061,6 +5069,9 @@ $(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5409,6 +5420,9 @@ $(OBJS)\monodll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(OBJS)\monodll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7095,6 +7109,9 @@ $(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7443,6 +7460,9 @@ $(OBJS)\monolib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(OBJS)\monolib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9450,6 +9470,9 @@ $(OBJS)\coredll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10795,6 +10818,9 @@ $(OBJS)\corelib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12656,6 +12682,9 @@ $(OBJS)\xrcdll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(OBJS)\xrcdll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -12818,6 +12847,9 @@ $(OBJS)\xrclib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(OBJS)\xrclib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 5c1f0bf9cf..d3e2de5726 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -4082,6 +4082,69 @@ SOURCE=..\..\src\generic\clrpickerg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\collpaneg.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\colrdlgg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -9457,6 +9520,10 @@ SOURCE=..\..\include\wx\xrc\xh_html.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_htmllbox.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_hyperlink.h # End Source File # Begin Source File diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index bf6042945b..30132ecd8a 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -1050,6 +1050,10 @@ SOURCE=..\..\include\wx\xrc\xh_html.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_htmllbox.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_hyperlink.h # End Source File # Begin Source File @@ -1262,6 +1266,10 @@ SOURCE=..\..\src\xrc\xh_html.cpp # End Source File # Begin Source File +SOURCE=..\..\src\xrc\xh_htmllbox.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\xrc\xh_hyperlink.cpp # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 9d3dd3e068..97d5efe736 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -1011,6 +1011,10 @@ SOURCE=.\generic\clrpickerg.cpp # End Source File # Begin Source File +SOURCE=.\generic\collpaneg.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\combog.cpp # End Source File # Begin Source File @@ -1931,6 +1935,10 @@ SOURCE=.\xrc\xh_html.cpp # End Source File # Begin Source File +SOURCE=.\xrc\xh_htmllbox.cpp +# End Source File +# Begin Source File + SOURCE=.\xrc\xh_hyperlink.cpp # End Source File # Begin Source File @@ -3515,6 +3523,10 @@ SOURCE=..\include\wx\xrc\xh_html.h # End Source File # Begin Source File +SOURCE=..\include\wx\xrc\xh_htmllbox.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\xrc\xh_hyperlink.h # End Source File # Begin Source File -- 2.47.2