diff --git a/Makefile.in b/Makefile.in index f39b67f76d..4dbe88165b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2372,7 +2372,6 @@ COND_PLATFORM_WIN32_1_QT_PLATFORM_HDR = \ @COND_PLATFORM_WIN32_1@QT_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_QT_PLATFORM_HDR) COND_PLATFORM_MACOSX_1_GTK_PLATFORM_HDR = \ wx/generic/caret.h \ - wx/generic/imaglist.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ wx/unix/sound.h \ @@ -2380,7 +2379,6 @@ COND_PLATFORM_MACOSX_1_GTK_PLATFORM_HDR = \ @COND_PLATFORM_MACOSX_1@GTK_PLATFORM_HDR = $(COND_PLATFORM_MACOSX_1_GTK_PLATFORM_HDR) COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR = \ wx/generic/caret.h \ - wx/generic/imaglist.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ wx/unix/sound.h \ @@ -2388,7 +2386,6 @@ COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR = \ @COND_PLATFORM_UNIX_1@GTK_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR) COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR = \ wx/generic/caret.h \ - wx/generic/imaglist.h \ wx/msw/ole/automtn.h \ wx/msw/ole/comimpl.h \ wx/msw/ole/oleutils.h \ @@ -2753,7 +2750,6 @@ COND_TOOLKIT_DFB_LOWLEVEL_HDR = \ wx/generic/caret.h \ wx/generic/colour.h \ wx/generic/icon.h \ - wx/generic/imaglist.h \ wx/generic/mask.h \ wx/dfb/app.h \ wx/dfb/bitmap.h \ @@ -2920,7 +2916,6 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR = \ @COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = COND_TOOLKIT_X11_LOWLEVEL_HDR = \ wx/generic/caret.h \ - wx/generic/imaglist.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ wx/unix/sound.h \ @@ -3019,6 +3014,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ wx/gtk/dataview.h \ wx/gtk/dvrenderer.h \ wx/gtk/srchctrl.h \ + wx/generic/imaglist.h \ wx/generic/fontdlgg.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR = \ @@ -3082,7 +3078,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR = \ wx/gtk/bmpcbox.h \ wx/gtk/dataview.h \ wx/gtk/dvrenderer.h \ - wx/gtk/srchctrl.h + wx/gtk/srchctrl.h \ + wx/generic/imaglist.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR = \ wx/generic/fdrepdlg.h \ @@ -3145,7 +3142,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR = \ wx/gtk/bmpcbox.h \ wx/gtk/dataview.h \ wx/gtk/dvrenderer.h \ - wx/gtk/srchctrl.h + wx/gtk/srchctrl.h \ + wx/generic/imaglist.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR) COND_TOOLKIT_MSW_GUI_HDR = \ wx/generic/clrpickerg.h \ @@ -3599,7 +3597,8 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \ wx/univ/toolbar.h \ wx/univ/toplevel.h \ wx/univ/window.h \ - wx/generic/activityindicator.h + wx/generic/activityindicator.h \ + wx/generic/imaglist.h @COND_USE_GUI_1_WXUNIV_1@GUI_CORE_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS) COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/affinematrix2dbase.h \ @@ -4613,6 +4612,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_topluniv.o \ monodll_winuniv.o \ monodll_generic_activityindicator.o \ + monodll_generic_imaglist.o \ monodll_gtk.o \ monodll_metal.o \ monodll_mono.o \ @@ -4827,7 +4827,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \ monodll_generic_caret.o \ monodll_generic_colour.o \ monodll_generic_icon.o \ - monodll_generic_imaglist.o \ monodll_mask.o \ monodll_generic_textmeasure.o \ monodll_dfb_app.o \ @@ -4998,7 +4997,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_gdiplus.o \ monodll_msw_graphics.o \ monodll_msw_icon.o \ - monodll_msw_imaglist.o \ monodll_msw_minifram.o \ monodll_msw_nonownedwnd.o \ monodll_comimpl.o \ @@ -5051,7 +5049,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_OSX_IPHONE@ $(__OSX_LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_generic_caret.o \ - monodll_generic_imaglist.o \ monodll_unix_dialup.o \ monodll_unix_fontenum.o \ monodll_unix_fontutil.o \ @@ -5155,6 +5152,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_gtk_bmpcbox.o \ monodll_animate.o \ monodll_gtk_srchctrl.o \ + monodll_generic_imaglist.o \ monodll_generic_activityindicator.o \ monodll_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS) @@ -5220,7 +5218,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS = \ monodll_gtk_dataview.o \ monodll_gtk_bmpcbox.o \ monodll_animate.o \ - monodll_gtk_srchctrl.o + monodll_gtk_srchctrl.o \ + monodll_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ @@ -5284,7 +5283,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS = \ monodll_gtk_dataview.o \ monodll_gtk_bmpcbox.o \ monodll_animate.o \ - monodll_gtk_srchctrl.o + monodll_gtk_srchctrl.o \ + monodll_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_clrpickerg.o \ @@ -5352,6 +5352,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_timectrl.o \ monodll_datecontrols.o \ monodll_generic_activityindicator.o \ + monodll_msw_imaglist.o \ monodll_msw_checklst.o \ monodll_msw_fdrepdlg.o \ monodll_msw_fontdlg.o @@ -5555,7 +5556,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_generic_caret.o \ monodll_generic_colour.o \ monodll_generic_icon.o \ - monodll_generic_imaglist.o \ monodll_mask.o \ monodll_generic_textmeasure.o \ monodll_dfb_app.o \ @@ -5726,7 +5726,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_gdiplus.o \ monodll_msw_graphics.o \ monodll_msw_icon.o \ - monodll_msw_imaglist.o \ monodll_msw_minifram.o \ monodll_msw_nonownedwnd.o \ monodll_comimpl.o \ @@ -5779,7 +5778,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_generic_caret.o \ - monodll_generic_imaglist.o \ monodll_unix_dialup.o \ monodll_unix_fontenum.o \ monodll_unix_fontutil.o \ @@ -6374,6 +6372,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_topluniv.o \ monolib_winuniv.o \ monolib_generic_activityindicator.o \ + monolib_generic_imaglist.o \ monolib_gtk.o \ monolib_metal.o \ monolib_mono.o \ @@ -6588,7 +6587,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_generic_caret.o \ monolib_generic_colour.o \ monolib_generic_icon.o \ - monolib_generic_imaglist.o \ monolib_mask.o \ monolib_generic_textmeasure.o \ monolib_dfb_app.o \ @@ -6759,7 +6757,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_gdiplus.o \ monolib_msw_graphics.o \ monolib_msw_icon.o \ - monolib_msw_imaglist.o \ monolib_msw_minifram.o \ monolib_msw_nonownedwnd.o \ monolib_comimpl.o \ @@ -6812,7 +6809,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_17) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_generic_caret.o \ - monolib_generic_imaglist.o \ monolib_unix_dialup.o \ monolib_unix_fontenum.o \ monolib_unix_fontutil.o \ @@ -6916,6 +6912,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_gtk_bmpcbox.o \ monolib_animate.o \ monolib_gtk_srchctrl.o \ + monolib_generic_imaglist.o \ monolib_generic_activityindicator.o \ monolib_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1) @@ -6981,7 +6978,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1 = \ monolib_gtk_dataview.o \ monolib_gtk_bmpcbox.o \ monolib_animate.o \ - monolib_gtk_srchctrl.o + monolib_gtk_srchctrl.o \ + monolib_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ @@ -7045,7 +7043,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1 = \ monolib_gtk_dataview.o \ monolib_gtk_bmpcbox.o \ monolib_animate.o \ - monolib_gtk_srchctrl.o + monolib_gtk_srchctrl.o \ + monolib_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_clrpickerg.o \ @@ -7113,6 +7112,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_timectrl.o \ monolib_datecontrols.o \ monolib_generic_activityindicator.o \ + monolib_msw_imaglist.o \ monolib_msw_checklst.o \ monolib_msw_fdrepdlg.o \ monolib_msw_fontdlg.o @@ -7316,7 +7316,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_generic_caret.o \ monolib_generic_colour.o \ monolib_generic_icon.o \ - monolib_generic_imaglist.o \ monolib_mask.o \ monolib_generic_textmeasure.o \ monolib_dfb_app.o \ @@ -7487,7 +7486,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_gdiplus.o \ monolib_msw_graphics.o \ monolib_msw_icon.o \ - monolib_msw_imaglist.o \ monolib_msw_minifram.o \ monolib_msw_nonownedwnd.o \ monolib_comimpl.o \ @@ -7540,7 +7538,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_17) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_generic_caret.o \ - monolib_generic_imaglist.o \ monolib_unix_dialup.o \ monolib_unix_fontenum.o \ monolib_unix_fontutil.o \ @@ -8287,6 +8284,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_topluniv.o \ coredll_winuniv.o \ coredll_generic_activityindicator.o \ + coredll_generic_imaglist.o \ coredll_gtk.o \ coredll_metal.o \ coredll_mono.o \ @@ -8501,7 +8499,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_generic_caret.o \ coredll_generic_colour.o \ coredll_generic_icon.o \ - coredll_generic_imaglist.o \ coredll_mask.o \ coredll_generic_textmeasure.o \ coredll_dfb_app.o \ @@ -8672,7 +8669,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_gdiplus.o \ coredll_msw_graphics.o \ coredll_msw_icon.o \ - coredll_msw_imaglist.o \ coredll_msw_minifram.o \ coredll_msw_nonownedwnd.o \ coredll_comimpl.o \ @@ -8725,7 +8721,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_generic_caret.o \ - coredll_generic_imaglist.o \ coredll_unix_dialup.o \ coredll_unix_fontenum.o \ coredll_unix_fontutil.o \ @@ -8829,6 +8824,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_gtk_bmpcbox.o \ coredll_animate.o \ coredll_gtk_srchctrl.o \ + coredll_generic_imaglist.o \ coredll_generic_activityindicator.o \ coredll_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2) @@ -8894,7 +8890,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2 = \ coredll_gtk_dataview.o \ coredll_gtk_bmpcbox.o \ coredll_animate.o \ - coredll_gtk_srchctrl.o + coredll_gtk_srchctrl.o \ + coredll_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ @@ -8958,7 +8955,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2 = \ coredll_gtk_dataview.o \ coredll_gtk_bmpcbox.o \ coredll_animate.o \ - coredll_gtk_srchctrl.o + coredll_gtk_srchctrl.o \ + coredll_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_clrpickerg.o \ @@ -9026,6 +9024,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_timectrl.o \ coredll_datecontrols.o \ coredll_generic_activityindicator.o \ + coredll_msw_imaglist.o \ coredll_msw_checklst.o \ coredll_msw_fdrepdlg.o \ coredll_msw_fontdlg.o @@ -9229,7 +9228,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_generic_caret.o \ coredll_generic_colour.o \ coredll_generic_icon.o \ - coredll_generic_imaglist.o \ coredll_mask.o \ coredll_generic_textmeasure.o \ coredll_dfb_app.o \ @@ -9400,7 +9398,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_gdiplus.o \ coredll_msw_graphics.o \ coredll_msw_icon.o \ - coredll_msw_imaglist.o \ coredll_msw_minifram.o \ coredll_msw_nonownedwnd.o \ coredll_comimpl.o \ @@ -9453,7 +9450,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_generic_caret.o \ - coredll_generic_imaglist.o \ coredll_unix_dialup.o \ coredll_unix_fontenum.o \ coredll_unix_fontutil.o \ @@ -9776,6 +9772,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_topluniv.o \ corelib_winuniv.o \ corelib_generic_activityindicator.o \ + corelib_generic_imaglist.o \ corelib_gtk.o \ corelib_metal.o \ corelib_mono.o \ @@ -9990,7 +9987,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_generic_caret.o \ corelib_generic_colour.o \ corelib_generic_icon.o \ - corelib_generic_imaglist.o \ corelib_mask.o \ corelib_generic_textmeasure.o \ corelib_dfb_app.o \ @@ -10161,7 +10157,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_gdiplus.o \ corelib_msw_graphics.o \ corelib_msw_icon.o \ - corelib_msw_imaglist.o \ corelib_msw_minifram.o \ corelib_msw_nonownedwnd.o \ corelib_comimpl.o \ @@ -10214,7 +10209,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_generic_caret.o \ - corelib_generic_imaglist.o \ corelib_unix_dialup.o \ corelib_unix_fontenum.o \ corelib_unix_fontutil.o \ @@ -10318,6 +10312,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_gtk_bmpcbox.o \ corelib_animate.o \ corelib_gtk_srchctrl.o \ + corelib_generic_imaglist.o \ corelib_generic_activityindicator.o \ corelib_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3) @@ -10383,7 +10378,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3 = \ corelib_gtk_dataview.o \ corelib_gtk_bmpcbox.o \ corelib_animate.o \ - corelib_gtk_srchctrl.o + corelib_gtk_srchctrl.o \ + corelib_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ @@ -10447,7 +10443,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3 = \ corelib_gtk_dataview.o \ corelib_gtk_bmpcbox.o \ corelib_animate.o \ - corelib_gtk_srchctrl.o + corelib_gtk_srchctrl.o \ + corelib_generic_imaglist.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_clrpickerg.o \ @@ -10515,6 +10512,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_timectrl.o \ corelib_datecontrols.o \ corelib_generic_activityindicator.o \ + corelib_msw_imaglist.o \ corelib_msw_checklst.o \ corelib_msw_fdrepdlg.o \ corelib_msw_fontdlg.o @@ -10718,7 +10716,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_generic_caret.o \ corelib_generic_colour.o \ corelib_generic_icon.o \ - corelib_generic_imaglist.o \ corelib_mask.o \ corelib_generic_textmeasure.o \ corelib_dfb_app.o \ @@ -10889,7 +10886,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_gdiplus.o \ corelib_msw_graphics.o \ corelib_msw_icon.o \ - corelib_msw_imaglist.o \ corelib_msw_minifram.o \ corelib_msw_nonownedwnd.o \ corelib_comimpl.o \ @@ -10942,7 +10938,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4) COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_generic_caret.o \ - corelib_generic_imaglist.o \ corelib_unix_dialup.o \ corelib_unix_fontenum.o \ corelib_unix_fontutil.o \ @@ -12275,7 +12270,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \ @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS = \ monodll_generic_caret.o \ - monodll_generic_imaglist.o \ monodll_unix_dialup.o \ monodll_unix_fontenum.o \ monodll_unix_fontutil.o \ @@ -12287,7 +12281,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS) COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS = \ monodll_generic_caret.o \ - monodll_generic_imaglist.o \ monodll_unix_dialup.o \ monodll_unix_fontenum.o \ monodll_unix_fontutil.o \ @@ -12299,7 +12292,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS) COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS = \ monodll_generic_caret.o \ - monodll_generic_imaglist.o \ monodll_automtn.o \ monodll_comimpl.o \ monodll_oleutils.o \ @@ -12412,7 +12404,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \ @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_0 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \ monolib_generic_caret.o \ - monolib_generic_imaglist.o \ monolib_unix_dialup.o \ monolib_unix_fontenum.o \ monolib_unix_fontutil.o \ @@ -12424,7 +12415,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \ @COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS_27 = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_27) COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \ monolib_generic_caret.o \ - monolib_generic_imaglist.o \ monolib_unix_dialup.o \ monolib_unix_fontenum.o \ monolib_unix_fontutil.o \ @@ -12436,7 +12426,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \ @COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS_27 = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_27) COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS_27 = \ monolib_generic_caret.o \ - monolib_generic_imaglist.o \ monolib_automtn.o \ monolib_comimpl.o \ monolib_oleutils.o \ @@ -12548,7 +12537,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \ @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_8 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \ coredll_generic_caret.o \ - coredll_generic_imaglist.o \ coredll_unix_dialup.o \ coredll_unix_fontenum.o \ coredll_unix_fontutil.o \ @@ -12560,7 +12548,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \ @COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4) COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \ coredll_generic_caret.o \ - coredll_generic_imaglist.o \ coredll_unix_dialup.o \ coredll_unix_fontenum.o \ coredll_unix_fontutil.o \ @@ -12572,7 +12559,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \ @COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS_1_4 = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_1_4) COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \ coredll_generic_caret.o \ - coredll_generic_imaglist.o \ coredll_automtn.o \ coredll_comimpl.o \ coredll_oleutils.o \ @@ -12684,7 +12670,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \ @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_9 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \ corelib_generic_caret.o \ - corelib_generic_imaglist.o \ corelib_unix_dialup.o \ corelib_unix_fontenum.o \ corelib_unix_fontutil.o \ @@ -12696,7 +12681,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \ @COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS_2_2 = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_2_2) COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \ corelib_generic_caret.o \ - corelib_generic_imaglist.o \ corelib_unix_dialup.o \ corelib_unix_fontenum.o \ corelib_unix_fontutil.o \ @@ -12708,7 +12692,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \ @COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS_2_2 = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_2_2) COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \ corelib_generic_caret.o \ - corelib_generic_imaglist.o \ corelib_automtn.o \ corelib_comimpl.o \ corelib_oleutils.o \ @@ -15337,6 +15320,9 @@ monodll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP) monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp +monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp + monodll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp @@ -16561,48 +16547,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -17389,9 +17333,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp @@ -18427,6 +18368,27 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_USE_GUI_1_WXUNIV_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp @@ -20101,6 +20063,9 @@ monolib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP) monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp +monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp + monolib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp @@ -21325,48 +21290,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -22153,9 +22076,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp @@ -23191,6 +23111,27 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_USE_GUI_1_WXUNIV_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp @@ -25546,6 +25487,9 @@ coredll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(COREDLL_ODEP) coredll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp +coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp + coredll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp @@ -26188,48 +26132,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -27016,9 +26918,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp @@ -28054,6 +27953,27 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_USE_GUI_1_WXUNIV_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp @@ -29281,6 +29201,9 @@ corelib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(CORELIB_ODEP) corelib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp +corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp + corelib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp @@ -29923,48 +29846,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -30751,9 +30632,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp @@ -31789,6 +31667,27 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + +@COND_USE_GUI_1_WXUNIV_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index f8546957e4..bb0c852118 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1334,7 +1334,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/caret.cpp - src/generic/imaglist.cpp src/unix/dialup.cpp src/unix/fontenum.cpp src/unix/fontutil.cpp @@ -1346,7 +1345,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/caret.h - wx/generic/imaglist.h wx/unix/fontutil.h wx/unix/utilsx11.h wx/unix/sound.h @@ -1360,7 +1358,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/caret.cpp - src/generic/imaglist.cpp src/msw/ole/automtn.cpp src/msw/ole/comimpl.cpp src/msw/ole/oleutils.cpp @@ -1378,7 +1375,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/caret.h - wx/generic/imaglist.h wx/msw/ole/automtn.h wx/msw/ole/comimpl.h wx/msw/ole/oleutils.h @@ -1540,6 +1536,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/bmpcbox.cpp src/gtk/animate.cpp src/gtk/srchctrl.cpp + src/generic/imaglist.cpp $(GTK_SRC) @@ -1608,6 +1605,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk/dataview.h wx/gtk/dvrenderer.h wx/gtk/srchctrl.h + wx/generic/imaglist.h $(GTK_HDR) @@ -1721,7 +1719,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/gdiplus.cpp src/msw/graphics.cpp src/msw/icon.cpp - src/msw/imaglist.cpp src/msw/minifram.cpp src/msw/nonownedwnd.cpp src/msw/ole/comimpl.cpp @@ -1888,6 +1885,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/timectrl.cpp src/msw/datecontrols.cpp src/generic/activityindicator.cpp + src/msw/imaglist.cpp wx/generic/clrpickerg.h @@ -2015,7 +2013,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/caret.cpp src/generic/colour.cpp src/generic/icon.cpp - src/generic/imaglist.cpp src/generic/mask.cpp src/generic/textmeasure.cpp src/dfb/app.cpp @@ -2045,7 +2042,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/caret.h wx/generic/colour.h wx/generic/icon.h - wx/generic/imaglist.h wx/generic/mask.h wx/dfb/app.h wx/dfb/bitmap.h @@ -2461,6 +2457,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/univ/topluniv.cpp src/univ/winuniv.cpp src/generic/activityindicator.cpp + src/generic/imaglist.cpp wx/generic/accel.h @@ -2519,6 +2516,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/univ/toplevel.h wx/univ/window.h wx/generic/activityindicator.h + wx/generic/imaglist.h diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index 4f0228c961..c1080685ce 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -1227,7 +1227,6 @@ set(UNIX_SRC set(XWIN_LOWLEVEL_SRC src/generic/caret.cpp - src/generic/imaglist.cpp src/unix/dialup.cpp src/unix/fontenum.cpp src/unix/fontutil.cpp @@ -1240,7 +1239,6 @@ set(XWIN_LOWLEVEL_SRC set(XWIN_LOWLEVEL_HDR wx/generic/caret.h - wx/generic/imaglist.h wx/unix/fontutil.h wx/unix/utilsx11.h wx/unix/sound.h @@ -1249,7 +1247,6 @@ set(XWIN_LOWLEVEL_HDR set(GTK_WIN32_SRC src/generic/caret.cpp - src/generic/imaglist.cpp src/msw/ole/automtn.cpp src/msw/ole/comimpl.cpp src/msw/ole/oleutils.cpp @@ -1268,7 +1265,6 @@ set(GTK_WIN32_SRC set(GTK_WIN32_HDR wx/generic/caret.h - wx/generic/imaglist.h wx/msw/ole/automtn.h wx/msw/ole/comimpl.h wx/msw/ole/oleutils.h @@ -1424,6 +1420,7 @@ set(GTK_SRC src/gtk/bmpcbox.cpp src/gtk/hyperlink.cpp src/gtk/srchctrl.cpp + src/generic/imaglist.cpp ) set(GTK2_SRC @@ -1494,6 +1491,7 @@ set(GTK_HDR wx/gtk/activityindicator.h wx/gtk/hyperlink.h wx/gtk/srchctrl.h + wx/generic/imaglist.h ) set(GTK2_HDR @@ -1598,7 +1596,6 @@ set(MSW_LOWLEVEL_SRC src/msw/graphics.cpp src/msw/graphicsd2d.cpp src/msw/icon.cpp - src/msw/imaglist.cpp src/msw/minifram.cpp src/msw/nonownedwnd.cpp src/msw/ole/comimpl.cpp @@ -1777,6 +1774,7 @@ set(MSW_SRC src/msw/datetimectrl.cpp src/msw/hyperlink.cpp src/generic/activityindicator.cpp + src/msw/imaglist.cpp ) set(MSW_HDR @@ -1901,7 +1899,6 @@ set(DFB_LOWLEVEL_SRC src/generic/caret.cpp src/generic/colour.cpp src/generic/icon.cpp - src/generic/imaglist.cpp src/generic/mask.cpp src/generic/textmeasure.cpp src/dfb/app.cpp @@ -1931,7 +1928,6 @@ set(DFB_LOWLEVEL_HDR wx/generic/caret.h wx/generic/colour.h wx/generic/icon.h - wx/generic/imaglist.h wx/generic/mask.h wx/dfb/app.h wx/dfb/bitmap.h @@ -2327,6 +2323,7 @@ set(UNIV_SRC src/univ/topluniv.cpp src/univ/winuniv.cpp src/generic/activityindicator.cpp + src/generic/imaglist.cpp ) set(UNIV_HDR @@ -2386,6 +2383,7 @@ set(UNIV_HDR wx/univ/toplevel.h wx/univ/window.h wx/generic/activityindicator.h + wx/generic/imaglist.h ) set(MEDIA_CMN_SRC diff --git a/build/files b/build/files index f8e3f85851..f603fe1303 100644 --- a/build/files +++ b/build/files @@ -1243,7 +1243,6 @@ UNIX_SRC = XWIN_LOWLEVEL_SRC = src/common/taskbarcmn.cpp src/generic/caret.cpp - src/generic/imaglist.cpp src/unix/dialup.cpp src/unix/fontenum.cpp src/unix/fontutil.cpp @@ -1254,7 +1253,6 @@ XWIN_LOWLEVEL_SRC = XWIN_LOWLEVEL_HDR = wx/generic/caret.h - wx/generic/imaglist.h wx/unix/fontutil.h wx/unix/joystick.h wx/unix/sound.h @@ -1266,7 +1264,6 @@ XWIN_LOWLEVEL_HDR = GTK_WIN32_SRC = src/common/taskbarcmn.cpp src/generic/caret.cpp - src/generic/imaglist.cpp src/msw/dialup.cpp src/msw/dib.cpp src/msw/display.cpp @@ -1282,7 +1279,6 @@ GTK_WIN32_SRC = src/unix/fontutil.cpp GTK_WIN32_HDR = wx/generic/caret.h - wx/generic/imaglist.h wx/msw/dib.h wx/msw/joystick.h wx/msw/ole/automtn.h @@ -1371,6 +1367,7 @@ GTK_SRC = src/generic/fdrepdlg.cpp # Needed as long as we support GTK+ < 2.6 src/generic/filepickerg.cpp + src/generic/imaglist.cpp src/generic/listctrl.cpp src/generic/prntdlgg.cpp src/generic/statusbr.cpp @@ -1441,6 +1438,7 @@ GTK_HDR = wx/generic/activityindicator.h wx/generic/fdrepdlg.h wx/generic/filepickerg.h + wx/generic/imaglist.h wx/generic/listctrl.h wx/generic/statusbr.h wx/gtk/accel.h @@ -1612,7 +1610,6 @@ MSW_LOWLEVEL_SRC = src/msw/helpchm.cpp src/msw/helpwin.cpp src/msw/icon.cpp - src/msw/imaglist.cpp src/msw/joystick.cpp src/msw/minifram.cpp src/msw/nonownedwnd.cpp @@ -1738,6 +1735,7 @@ MSW_SRC = src/msw/gauge.cpp src/msw/headerctrl.cpp src/msw/hyperlink.cpp + src/msw/imaglist.cpp src/msw/iniconf.cpp src/msw/listbox.cpp src/msw/listctrl.cpp @@ -1891,7 +1889,6 @@ DFB_LOWLEVEL_SRC = src/generic/caret.cpp src/generic/colour.cpp src/generic/icon.cpp - src/generic/imaglist.cpp src/generic/mask.cpp src/generic/textmeasure.cpp src/dfb/app.cpp @@ -1919,7 +1916,6 @@ DFB_LOWLEVEL_HDR = wx/generic/caret.h wx/generic/colour.h wx/generic/icon.h - wx/generic/imaglist.h wx/generic/mask.h wx/dfb/app.h wx/dfb/bitmap.h @@ -2270,6 +2266,7 @@ UNIV_SRC = src/generic/filepickerg.cpp src/generic/fontdlgg.cpp src/generic/fontpickerg.cpp + src/generic/imaglist.cpp src/generic/listctrl.cpp src/generic/mdig.cpp src/generic/prntdlgg.cpp @@ -2322,6 +2319,7 @@ UNIV_HDR = wx/generic/filepickerg.h wx/generic/fontdlgg.h wx/generic/fontpickerg.h + wx/generic/imaglist.h wx/generic/listctrl.h wx/generic/mdig.h wx/generic/statusbr.h diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 5ace30e53b..f5957fe6b7 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1896,7 +1896,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiplus.o \ $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_icon.o \ - $(OBJS)\monodll_imaglist.o \ $(OBJS)\monodll_minifram.o \ $(OBJS)\monodll_nonownedwnd.o \ $(OBJS)\monodll_comimpl.o \ @@ -2007,6 +2006,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_timectrl.o \ $(OBJS)\monodll_datecontrols.o \ $(OBJS)\monodll_activityindicator.o \ + $(OBJS)\monodll_msw_imaglist.o \ $(OBJS)\monodll_msw_checklst.o \ $(OBJS)\monodll_msw_fdrepdlg.o \ $(OBJS)\monodll_fontdlg.o \ @@ -2244,7 +2244,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiplus.o \ $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_icon.o \ - $(OBJS)\monodll_imaglist.o \ $(OBJS)\monodll_minifram.o \ $(OBJS)\monodll_nonownedwnd.o \ $(OBJS)\monodll_comimpl.o \ @@ -2341,6 +2340,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_topluniv.o \ $(OBJS)\monodll_winuniv.o \ $(OBJS)\monodll_activityindicator.o \ + $(OBJS)\monodll_generic_imaglist.o \ $(OBJS)\monodll_gtk.o \ $(OBJS)\monodll_metal.o \ $(OBJS)\monodll_mono.o \ @@ -2751,7 +2751,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiplus.o \ $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_icon.o \ - $(OBJS)\monolib_imaglist.o \ $(OBJS)\monolib_minifram.o \ $(OBJS)\monolib_nonownedwnd.o \ $(OBJS)\monolib_comimpl.o \ @@ -2862,6 +2861,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_timectrl.o \ $(OBJS)\monolib_datecontrols.o \ $(OBJS)\monolib_activityindicator.o \ + $(OBJS)\monolib_msw_imaglist.o \ $(OBJS)\monolib_msw_checklst.o \ $(OBJS)\monolib_msw_fdrepdlg.o \ $(OBJS)\monolib_fontdlg.o \ @@ -3099,7 +3099,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiplus.o \ $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_icon.o \ - $(OBJS)\monolib_imaglist.o \ $(OBJS)\monolib_minifram.o \ $(OBJS)\monolib_nonownedwnd.o \ $(OBJS)\monolib_comimpl.o \ @@ -3196,6 +3195,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_topluniv.o \ $(OBJS)\monolib_winuniv.o \ $(OBJS)\monolib_activityindicator.o \ + $(OBJS)\monolib_generic_imaglist.o \ $(OBJS)\monolib_gtk.o \ $(OBJS)\monolib_metal.o \ $(OBJS)\monolib_mono.o \ @@ -3485,7 +3485,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiplus.o \ $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_icon.o \ - $(OBJS)\coredll_imaglist.o \ $(OBJS)\coredll_minifram.o \ $(OBJS)\coredll_nonownedwnd.o \ $(OBJS)\coredll_comimpl.o \ @@ -3596,6 +3595,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_timectrl.o \ $(OBJS)\coredll_datecontrols.o \ $(OBJS)\coredll_activityindicator.o \ + $(OBJS)\coredll_msw_imaglist.o \ $(OBJS)\coredll_msw_checklst.o \ $(OBJS)\coredll_msw_fdrepdlg.o \ $(OBJS)\coredll_fontdlg.o \ @@ -3833,7 +3833,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiplus.o \ $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_icon.o \ - $(OBJS)\coredll_imaglist.o \ $(OBJS)\coredll_minifram.o \ $(OBJS)\coredll_nonownedwnd.o \ $(OBJS)\coredll_comimpl.o \ @@ -3930,6 +3929,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_topluniv.o \ $(OBJS)\coredll_winuniv.o \ $(OBJS)\coredll_activityindicator.o \ + $(OBJS)\coredll_generic_imaglist.o \ $(OBJS)\coredll_gtk.o \ $(OBJS)\coredll_metal.o \ $(OBJS)\coredll_mono.o \ @@ -4176,7 +4176,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiplus.o \ $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_icon.o \ - $(OBJS)\corelib_imaglist.o \ $(OBJS)\corelib_minifram.o \ $(OBJS)\corelib_nonownedwnd.o \ $(OBJS)\corelib_comimpl.o \ @@ -4287,6 +4286,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_timectrl.o \ $(OBJS)\corelib_datecontrols.o \ $(OBJS)\corelib_activityindicator.o \ + $(OBJS)\corelib_msw_imaglist.o \ $(OBJS)\corelib_msw_checklst.o \ $(OBJS)\corelib_msw_fdrepdlg.o \ $(OBJS)\corelib_fontdlg.o \ @@ -4524,7 +4524,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiplus.o \ $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_icon.o \ - $(OBJS)\corelib_imaglist.o \ $(OBJS)\corelib_minifram.o \ $(OBJS)\corelib_nonownedwnd.o \ $(OBJS)\corelib_comimpl.o \ @@ -4621,6 +4620,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_topluniv.o \ $(OBJS)\corelib_winuniv.o \ $(OBJS)\corelib_activityindicator.o \ + $(OBJS)\corelib_generic_imaglist.o \ $(OBJS)\corelib_gtk.o \ $(OBJS)\corelib_metal.o \ $(OBJS)\corelib_mono.o \ @@ -7545,6 +7545,9 @@ $(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp $(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_msw_imaglist.o: ../../src/msw/imaglist.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_msw_checklst.o: ../../src/msw/checklst.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7689,6 +7692,9 @@ $(OBJS)\monodll_topluniv.o: ../../src/univ/topluniv.cpp $(OBJS)\monodll_winuniv.o: ../../src/univ/winuniv.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_generic_imaglist.o: ../../src/generic/imaglist.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_gtk.o: ../../src/univ/themes/gtk.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8288,11 +8294,6 @@ $(OBJS)\monodll_icon.o: ../../src/msw/icon.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -10138,6 +10139,9 @@ $(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp $(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_msw_imaglist.o: ../../src/msw/imaglist.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_msw_checklst.o: ../../src/msw/checklst.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10282,6 +10286,9 @@ $(OBJS)\monolib_topluniv.o: ../../src/univ/topluniv.cpp $(OBJS)\monolib_winuniv.o: ../../src/univ/winuniv.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_generic_imaglist.o: ../../src/generic/imaglist.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_gtk.o: ../../src/univ/themes/gtk.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10881,11 +10888,6 @@ $(OBJS)\monolib_icon.o: ../../src/msw/icon.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -13154,6 +13156,9 @@ $(OBJS)\coredll_timectrl.o: ../../src/msw/timectrl.cpp $(OBJS)\coredll_datecontrols.o: ../../src/msw/datecontrols.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_msw_imaglist.o: ../../src/msw/imaglist.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_msw_checklst.o: ../../src/msw/checklst.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13298,6 +13303,9 @@ $(OBJS)\coredll_topluniv.o: ../../src/univ/topluniv.cpp $(OBJS)\coredll_winuniv.o: ../../src/univ/winuniv.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_generic_imaglist.o: ../../src/generic/imaglist.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_gtk.o: ../../src/univ/themes/gtk.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13435,11 +13443,6 @@ $(OBJS)\coredll_icon.o: ../../src/msw/icon.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14913,6 +14916,9 @@ $(OBJS)\corelib_timectrl.o: ../../src/msw/timectrl.cpp $(OBJS)\corelib_datecontrols.o: ../../src/msw/datecontrols.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_msw_imaglist.o: ../../src/msw/imaglist.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_msw_checklst.o: ../../src/msw/checklst.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -15057,6 +15063,9 @@ $(OBJS)\corelib_topluniv.o: ../../src/univ/topluniv.cpp $(OBJS)\corelib_winuniv.o: ../../src/univ/winuniv.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_generic_imaglist.o: ../../src/generic/imaglist.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_gtk.o: ../../src/univ/themes/gtk.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -15194,11 +15203,6 @@ $(OBJS)\corelib_icon.o: ../../src/msw/icon.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index e0453fea72..c85985677d 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2229,7 +2229,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_minifram.obj \ $(OBJS)\monodll_nonownedwnd.obj \ $(OBJS)\monodll_comimpl.obj \ @@ -2340,6 +2339,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_timectrl.obj \ $(OBJS)\monodll_datecontrols.obj \ $(OBJS)\monodll_activityindicator.obj \ + $(OBJS)\monodll_msw_imaglist.obj \ $(OBJS)\monodll_msw_checklst.obj \ $(OBJS)\monodll_msw_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ @@ -2575,7 +2575,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_minifram.obj \ $(OBJS)\monodll_nonownedwnd.obj \ $(OBJS)\monodll_comimpl.obj \ @@ -2672,6 +2671,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_topluniv.obj \ $(OBJS)\monodll_winuniv.obj \ $(OBJS)\monodll_activityindicator.obj \ + $(OBJS)\monodll_generic_imaglist.obj \ $(OBJS)\monodll_gtk.obj \ $(OBJS)\monodll_metal.obj \ $(OBJS)\monodll_mono.obj \ @@ -3084,7 +3084,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_minifram.obj \ $(OBJS)\monolib_nonownedwnd.obj \ $(OBJS)\monolib_comimpl.obj \ @@ -3195,6 +3194,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_timectrl.obj \ $(OBJS)\monolib_datecontrols.obj \ $(OBJS)\monolib_activityindicator.obj \ + $(OBJS)\monolib_msw_imaglist.obj \ $(OBJS)\monolib_msw_checklst.obj \ $(OBJS)\monolib_msw_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ @@ -3430,7 +3430,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_minifram.obj \ $(OBJS)\monolib_nonownedwnd.obj \ $(OBJS)\monolib_comimpl.obj \ @@ -3527,6 +3526,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_topluniv.obj \ $(OBJS)\monolib_winuniv.obj \ $(OBJS)\monolib_activityindicator.obj \ + $(OBJS)\monolib_generic_imaglist.obj \ $(OBJS)\monolib_gtk.obj \ $(OBJS)\monolib_metal.obj \ $(OBJS)\monolib_mono.obj \ @@ -3868,7 +3868,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_minifram.obj \ $(OBJS)\coredll_nonownedwnd.obj \ $(OBJS)\coredll_comimpl.obj \ @@ -3979,6 +3978,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_timectrl.obj \ $(OBJS)\coredll_datecontrols.obj \ $(OBJS)\coredll_activityindicator.obj \ + $(OBJS)\coredll_msw_imaglist.obj \ $(OBJS)\coredll_msw_checklst.obj \ $(OBJS)\coredll_msw_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ @@ -4214,7 +4214,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_minifram.obj \ $(OBJS)\coredll_nonownedwnd.obj \ $(OBJS)\coredll_comimpl.obj \ @@ -4311,6 +4310,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_topluniv.obj \ $(OBJS)\coredll_winuniv.obj \ $(OBJS)\coredll_activityindicator.obj \ + $(OBJS)\coredll_generic_imaglist.obj \ $(OBJS)\coredll_gtk.obj \ $(OBJS)\coredll_metal.obj \ $(OBJS)\coredll_mono.obj \ @@ -4557,7 +4557,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_minifram.obj \ $(OBJS)\corelib_nonownedwnd.obj \ $(OBJS)\corelib_comimpl.obj \ @@ -4668,6 +4667,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_timectrl.obj \ $(OBJS)\corelib_datecontrols.obj \ $(OBJS)\corelib_activityindicator.obj \ + $(OBJS)\corelib_msw_imaglist.obj \ $(OBJS)\corelib_msw_checklst.obj \ $(OBJS)\corelib_msw_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ @@ -4903,7 +4903,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_minifram.obj \ $(OBJS)\corelib_nonownedwnd.obj \ $(OBJS)\corelib_comimpl.obj \ @@ -5000,6 +4999,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_topluniv.obj \ $(OBJS)\corelib_winuniv.obj \ $(OBJS)\corelib_activityindicator.obj \ + $(OBJS)\corelib_generic_imaglist.obj \ $(OBJS)\corelib_gtk.obj \ $(OBJS)\corelib_metal.obj \ $(OBJS)\corelib_mono.obj \ @@ -8002,6 +8002,9 @@ $(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp $(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp +$(OBJS)\monodll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp + $(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp @@ -8146,6 +8149,9 @@ $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp $(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp +$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp + $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp @@ -8745,11 +8751,6 @@ $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp @@ -10595,6 +10596,9 @@ $(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp $(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp +$(OBJS)\monolib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp + $(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp @@ -10739,6 +10743,9 @@ $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp $(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp +$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp + $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp @@ -11338,11 +11345,6 @@ $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp @@ -13611,6 +13613,9 @@ $(OBJS)\coredll_timectrl.obj: ..\..\src\msw\timectrl.cpp $(OBJS)\coredll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp +$(OBJS)\coredll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp + $(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp @@ -13755,6 +13760,9 @@ $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp $(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp +$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp + $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp @@ -13892,11 +13900,6 @@ $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp @@ -15370,6 +15373,9 @@ $(OBJS)\corelib_timectrl.obj: ..\..\src\msw\timectrl.cpp $(OBJS)\corelib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp +$(OBJS)\corelib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp + $(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp @@ -15514,6 +15520,9 @@ $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp $(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp +$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp + $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp @@ -15651,11 +15660,6 @@ $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h index 5fd6a9f9a3..5a6ddc8051 100644 --- a/include/wx/imaglist.h +++ b/include/wx/imaglist.h @@ -41,7 +41,7 @@ enum #define wxIMAGELIST_DRAW_SELECTED 0x0004 #define wxIMAGELIST_DRAW_FOCUSED 0x0008 -#if defined(__WXMSW__) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/imaglist.h" #define wxHAS_NATIVE_IMAGELIST #else