diff --git a/Makefile.in b/Makefile.in index c09f3e1d91..21712e8f4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4855,7 +4855,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \ monodll_fontmgrcmn.o \ monodll_generic_caret.o \ monodll_generic_colour.o \ - monodll_generic_icon.o \ monodll_mask.o \ monodll_generic_textmeasure.o \ monodll_dfb_app.o \ @@ -4882,7 +4881,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \ $(__GTK_PLATFORM_SRC_OBJECTS) \ - monodll_generic_icon.o \ monodll_paletteg.o \ monodll_gtk_app.o \ monodll_assertdlg_gtk.o \ @@ -4924,7 +4922,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS = \ $(__GTK_PLATFORM_SRC_OBJECTS) \ - monodll_generic_icon.o \ monodll_paletteg.o \ monodll_gtk_app.o \ monodll_assertdlg_gtk.o \ @@ -4963,7 +4960,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS = \ $(__GTK_PLATFORM_SRC_OBJECTS) \ - monodll_generic_icon.o \ monodll_paletteg.o \ monodll_gtk_app.o \ monodll_assertdlg_gtk.o \ @@ -5024,7 +5020,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_fontutil.o \ monodll_gdiimage.o \ monodll_msw_graphics.o \ - monodll_msw_icon.o \ + monodll_icon.o \ monodll_msw_minifram.o \ monodll_msw_nonownedwnd.o \ monodll_comimpl.o \ @@ -5085,7 +5081,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_unix_sound.o \ monodll_taskbarcmn.o \ monodll_unix_joystick.o \ - monodll_generic_icon.o \ monodll_generic_textmeasure.o \ monodll_generic_timer.o \ monodll_x11_app.o \ @@ -5476,7 +5471,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \ monodll_generic_fdrepdlg.o \ monodll_filepickerg.o \ monodll_fontpickerg.o \ - monodll_generic_icon.o \ monodll_generic_imaglist.o \ monodll_prntdlgg.o \ monodll_generic_textmeasure.o \ @@ -5588,7 +5582,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontmgrcmn.o \ monodll_generic_caret.o \ monodll_generic_colour.o \ - monodll_generic_icon.o \ monodll_mask.o \ monodll_generic_textmeasure.o \ monodll_dfb_app.o \ @@ -5615,7 +5608,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \ $(__GTK_PLATFORM_SRC_OBJECTS) \ - monodll_generic_icon.o \ monodll_paletteg.o \ monodll_gtk_app.o \ monodll_assertdlg_gtk.o \ @@ -5657,7 +5649,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_1 = \ $(__GTK_PLATFORM_SRC_OBJECTS) \ - monodll_generic_icon.o \ monodll_paletteg.o \ monodll_gtk_app.o \ monodll_assertdlg_gtk.o \ @@ -5696,7 +5687,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_1 = \ $(__GTK_PLATFORM_SRC_OBJECTS) \ - monodll_generic_icon.o \ monodll_paletteg.o \ monodll_gtk_app.o \ monodll_assertdlg_gtk.o \ @@ -5757,7 +5747,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_fontutil.o \ monodll_gdiimage.o \ monodll_msw_graphics.o \ - monodll_msw_icon.o \ + monodll_icon.o \ monodll_msw_minifram.o \ monodll_msw_nonownedwnd.o \ monodll_comimpl.o \ @@ -5818,7 +5808,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_unix_sound.o \ monodll_taskbarcmn.o \ monodll_unix_joystick.o \ - monodll_generic_icon.o \ monodll_generic_textmeasure.o \ monodll_generic_timer.o \ monodll_x11_app.o \ @@ -6621,7 +6610,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontmgrcmn.o \ monolib_generic_caret.o \ monolib_generic_colour.o \ - monolib_generic_icon.o \ monolib_mask.o \ monolib_generic_textmeasure.o \ monolib_dfb_app.o \ @@ -6648,7 +6636,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \ $(__GTK_PLATFORM_SRC_OBJECTS_27) \ - monolib_generic_icon.o \ monolib_paletteg.o \ monolib_gtk_app.o \ monolib_assertdlg_gtk.o \ @@ -6690,7 +6677,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_2 = \ $(__GTK_PLATFORM_SRC_OBJECTS_27) \ - monolib_generic_icon.o \ monolib_paletteg.o \ monolib_gtk_app.o \ monolib_assertdlg_gtk.o \ @@ -6729,7 +6715,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_2 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_2 = \ $(__GTK_PLATFORM_SRC_OBJECTS_27) \ - monolib_generic_icon.o \ monolib_paletteg.o \ monolib_gtk_app.o \ monolib_assertdlg_gtk.o \ @@ -6790,7 +6775,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_fontutil.o \ monolib_gdiimage.o \ monolib_msw_graphics.o \ - monolib_msw_icon.o \ + monolib_icon.o \ monolib_msw_minifram.o \ monolib_msw_nonownedwnd.o \ monolib_comimpl.o \ @@ -6851,7 +6836,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_unix_sound.o \ monolib_taskbarcmn.o \ monolib_unix_joystick.o \ - monolib_generic_icon.o \ monolib_generic_textmeasure.o \ monolib_generic_timer.o \ monolib_x11_app.o \ @@ -7242,7 +7226,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \ monolib_generic_fdrepdlg.o \ monolib_filepickerg.o \ monolib_fontpickerg.o \ - monolib_generic_icon.o \ monolib_generic_imaglist.o \ monolib_prntdlgg.o \ monolib_generic_textmeasure.o \ @@ -7354,7 +7337,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontmgrcmn.o \ monolib_generic_caret.o \ monolib_generic_colour.o \ - monolib_generic_icon.o \ monolib_mask.o \ monolib_generic_textmeasure.o \ monolib_dfb_app.o \ @@ -7381,7 +7363,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \ $(__GTK_PLATFORM_SRC_OBJECTS_27) \ - monolib_generic_icon.o \ monolib_paletteg.o \ monolib_gtk_app.o \ monolib_assertdlg_gtk.o \ @@ -7423,7 +7404,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_3 = \ $(__GTK_PLATFORM_SRC_OBJECTS_27) \ - monolib_generic_icon.o \ monolib_paletteg.o \ monolib_gtk_app.o \ monolib_assertdlg_gtk.o \ @@ -7462,7 +7442,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_3 = \ $(__GTK_PLATFORM_SRC_OBJECTS_27) \ - monolib_generic_icon.o \ monolib_paletteg.o \ monolib_gtk_app.o \ monolib_assertdlg_gtk.o \ @@ -7523,7 +7502,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_fontutil.o \ monolib_gdiimage.o \ monolib_msw_graphics.o \ - monolib_msw_icon.o \ + monolib_icon.o \ monolib_msw_minifram.o \ monolib_msw_nonownedwnd.o \ monolib_comimpl.o \ @@ -7584,7 +7563,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_unix_sound.o \ monolib_taskbarcmn.o \ monolib_unix_joystick.o \ - monolib_generic_icon.o \ monolib_generic_textmeasure.o \ monolib_generic_timer.o \ monolib_x11_app.o \ @@ -8537,7 +8515,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontmgrcmn.o \ coredll_generic_caret.o \ coredll_generic_colour.o \ - coredll_generic_icon.o \ coredll_mask.o \ coredll_generic_textmeasure.o \ coredll_dfb_app.o \ @@ -8564,7 +8541,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \ $(__GTK_PLATFORM_SRC_OBJECTS_1_4) \ - coredll_generic_icon.o \ coredll_paletteg.o \ coredll_gtk_app.o \ coredll_assertdlg_gtk.o \ @@ -8606,7 +8582,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_4 = \ $(__GTK_PLATFORM_SRC_OBJECTS_1_4) \ - coredll_generic_icon.o \ coredll_paletteg.o \ coredll_gtk_app.o \ coredll_assertdlg_gtk.o \ @@ -8645,7 +8620,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_4 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_4) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_4 = \ $(__GTK_PLATFORM_SRC_OBJECTS_1_4) \ - coredll_generic_icon.o \ coredll_paletteg.o \ coredll_gtk_app.o \ coredll_assertdlg_gtk.o \ @@ -8706,7 +8680,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_fontutil.o \ coredll_gdiimage.o \ coredll_msw_graphics.o \ - coredll_msw_icon.o \ + coredll_icon.o \ coredll_msw_minifram.o \ coredll_msw_nonownedwnd.o \ coredll_comimpl.o \ @@ -8767,7 +8741,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_unix_sound.o \ coredll_taskbarcmn.o \ coredll_unix_joystick.o \ - coredll_generic_icon.o \ coredll_generic_textmeasure.o \ coredll_generic_timer.o \ coredll_x11_app.o \ @@ -9158,7 +9131,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \ coredll_generic_fdrepdlg.o \ coredll_filepickerg.o \ coredll_fontpickerg.o \ - coredll_generic_icon.o \ coredll_generic_imaglist.o \ coredll_prntdlgg.o \ coredll_generic_textmeasure.o \ @@ -9270,7 +9242,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontmgrcmn.o \ coredll_generic_caret.o \ coredll_generic_colour.o \ - coredll_generic_icon.o \ coredll_mask.o \ coredll_generic_textmeasure.o \ coredll_dfb_app.o \ @@ -9297,7 +9268,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \ $(__GTK_PLATFORM_SRC_OBJECTS_1_4) \ - coredll_generic_icon.o \ coredll_paletteg.o \ coredll_gtk_app.o \ coredll_assertdlg_gtk.o \ @@ -9339,7 +9309,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_5 = \ $(__GTK_PLATFORM_SRC_OBJECTS_1_4) \ - coredll_generic_icon.o \ coredll_paletteg.o \ coredll_gtk_app.o \ coredll_assertdlg_gtk.o \ @@ -9378,7 +9347,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_5) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_5 = \ $(__GTK_PLATFORM_SRC_OBJECTS_1_4) \ - coredll_generic_icon.o \ coredll_paletteg.o \ coredll_gtk_app.o \ coredll_assertdlg_gtk.o \ @@ -9439,7 +9407,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_fontutil.o \ coredll_gdiimage.o \ coredll_msw_graphics.o \ - coredll_msw_icon.o \ + coredll_icon.o \ coredll_msw_minifram.o \ coredll_msw_nonownedwnd.o \ coredll_comimpl.o \ @@ -9500,7 +9468,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_unix_sound.o \ coredll_taskbarcmn.o \ coredll_unix_joystick.o \ - coredll_generic_icon.o \ coredll_generic_textmeasure.o \ coredll_generic_timer.o \ coredll_x11_app.o \ @@ -10028,7 +9995,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontmgrcmn.o \ corelib_generic_caret.o \ corelib_generic_colour.o \ - corelib_generic_icon.o \ corelib_mask.o \ corelib_generic_textmeasure.o \ corelib_dfb_app.o \ @@ -10055,7 +10021,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \ $(__GTK_PLATFORM_SRC_OBJECTS_2_2) \ - corelib_generic_icon.o \ corelib_paletteg.o \ corelib_gtk_app.o \ corelib_assertdlg_gtk.o \ @@ -10097,7 +10062,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_6 = \ $(__GTK_PLATFORM_SRC_OBJECTS_2_2) \ - corelib_generic_icon.o \ corelib_paletteg.o \ corelib_gtk_app.o \ corelib_assertdlg_gtk.o \ @@ -10136,7 +10100,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_6 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_6) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_6 = \ $(__GTK_PLATFORM_SRC_OBJECTS_2_2) \ - corelib_generic_icon.o \ corelib_paletteg.o \ corelib_gtk_app.o \ corelib_assertdlg_gtk.o \ @@ -10197,7 +10160,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_fontutil.o \ corelib_gdiimage.o \ corelib_msw_graphics.o \ - corelib_msw_icon.o \ + corelib_icon.o \ corelib_msw_minifram.o \ corelib_msw_nonownedwnd.o \ corelib_comimpl.o \ @@ -10258,7 +10221,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_unix_sound.o \ corelib_taskbarcmn.o \ corelib_unix_joystick.o \ - corelib_generic_icon.o \ corelib_generic_textmeasure.o \ corelib_generic_timer.o \ corelib_x11_app.o \ @@ -10649,7 +10611,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \ corelib_generic_fdrepdlg.o \ corelib_filepickerg.o \ corelib_fontpickerg.o \ - corelib_generic_icon.o \ corelib_generic_imaglist.o \ corelib_prntdlgg.o \ corelib_generic_textmeasure.o \ @@ -10761,7 +10722,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontmgrcmn.o \ corelib_generic_caret.o \ corelib_generic_colour.o \ - corelib_generic_icon.o \ corelib_mask.o \ corelib_generic_textmeasure.o \ corelib_dfb_app.o \ @@ -10788,7 +10748,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \ $(__GTK_PLATFORM_SRC_OBJECTS_2_2) \ - corelib_generic_icon.o \ corelib_paletteg.o \ corelib_gtk_app.o \ corelib_assertdlg_gtk.o \ @@ -10830,7 +10789,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_7 = \ $(__GTK_PLATFORM_SRC_OBJECTS_2_2) \ - corelib_generic_icon.o \ corelib_paletteg.o \ corelib_gtk_app.o \ corelib_assertdlg_gtk.o \ @@ -10869,7 +10827,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_7) COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_7 = \ $(__GTK_PLATFORM_SRC_OBJECTS_2_2) \ - corelib_generic_icon.o \ corelib_paletteg.o \ corelib_gtk_app.o \ corelib_assertdlg_gtk.o \ @@ -10930,7 +10887,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_fontutil.o \ corelib_gdiimage.o \ corelib_msw_graphics.o \ - corelib_msw_icon.o \ + corelib_icon.o \ corelib_msw_minifram.o \ corelib_msw_nonownedwnd.o \ corelib_comimpl.o \ @@ -10991,7 +10948,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_unix_sound.o \ corelib_taskbarcmn.o \ corelib_unix_joystick.o \ - corelib_generic_icon.o \ corelib_generic_textmeasure.o \ corelib_generic_timer.o \ corelib_x11_app.o \ @@ -12310,7 +12266,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \ monodll_prntdlgg.o \ monodll_generic_statusbr.o \ monodll_generic_textmeasure.o \ - monodll_generic_icon.o \ monodll_statbmp_osx.o \ monodll_generic_imaglist.o @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS) @@ -12443,7 +12398,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \ monolib_prntdlgg.o \ monolib_generic_statusbr.o \ monolib_generic_textmeasure.o \ - monolib_generic_icon.o \ monolib_statbmp_osx.o \ monolib_generic_imaglist.o @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_0 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0) @@ -12575,7 +12529,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \ coredll_prntdlgg.o \ coredll_generic_statusbr.o \ coredll_generic_textmeasure.o \ - coredll_generic_icon.o \ coredll_statbmp_osx.o \ coredll_generic_imaglist.o @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_8 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8) @@ -12707,7 +12660,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \ corelib_prntdlgg.o \ corelib_generic_statusbr.o \ corelib_generic_textmeasure.o \ - corelib_generic_icon.o \ corelib_statbmp_osx.o \ corelib_generic_imaglist.o @COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_9 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9) @@ -17005,30 +16957,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp @@ -17416,7 +17344,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_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_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP) @@ -21763,30 +21691,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp @@ -22174,7 +22078,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_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_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP) @@ -26611,30 +26515,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp @@ -27022,7 +26902,7 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_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_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP) @@ -30331,30 +30211,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp - @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp @@ -30742,7 +30598,7 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_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_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 5df3d90b4e..2058f26241 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -386,7 +386,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fdrepdlg.cpp src/generic/filepickerg.cpp src/generic/fontpickerg.cpp - src/generic/icon.cpp src/generic/imaglist.cpp src/generic/prntdlgg.cpp src/generic/textmeasure.cpp @@ -1407,7 +1406,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(GTK_PLATFORM_SRC) - src/generic/icon.cpp src/generic/paletteg.cpp src/gtk/app.cpp src/gtk/assertdlg_gtk.cpp @@ -1629,7 +1627,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(XWIN_LOWLEVEL_SRC) - src/generic/icon.cpp src/generic/textmeasure.cpp src/generic/timer.cpp src/x11/app.cpp @@ -2020,7 +2017,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/fontmgrcmn.cpp src/generic/caret.cpp src/generic/colour.cpp - src/generic/icon.cpp src/generic/mask.cpp src/generic/textmeasure.cpp src/dfb/app.cpp @@ -2181,7 +2177,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/prntdlgg.cpp src/generic/statusbr.cpp src/generic/textmeasure.cpp - src/generic/icon.cpp src/osx/statbmp_osx.cpp src/generic/imaglist.cpp diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index bdea252b76..447d64a4c6 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -336,7 +336,6 @@ set(QT_SRC src/generic/fontpickerg.cpp src/qt/frame.cpp src/qt/gauge.cpp - src/generic/icon.cpp src/generic/imaglist.cpp src/qt/listbox.cpp src/qt/listctrl.cpp @@ -1288,7 +1287,6 @@ set(GTK_WIN32_HDR set(GTK_LOWLEVEL_SRC ${GTK_PLATFORM_SRC} - src/generic/icon.cpp src/generic/paletteg.cpp src/gtk/app.cpp src/gtk/assertdlg_gtk.cpp @@ -1510,7 +1508,6 @@ set(GTK2_HDR set(X11_LOWLEVEL_SRC ${XWIN_LOWLEVEL_SRC} - src/generic/icon.cpp src/generic/textmeasure.cpp src/generic/timer.cpp src/x11/app.cpp @@ -1906,7 +1903,6 @@ set(DFB_LOWLEVEL_SRC src/common/fontmgrcmn.cpp src/generic/caret.cpp src/generic/colour.cpp - src/generic/icon.cpp src/generic/mask.cpp src/generic/textmeasure.cpp src/dfb/app.cpp @@ -2060,7 +2056,6 @@ set(OSX_COMMON_SRC src/generic/prntdlgg.cpp src/generic/statusbr.cpp src/generic/textmeasure.cpp - src/generic/icon.cpp #TODO: src/osx/statbmp_osx.cpp src/generic/imaglist.cpp diff --git a/build/files b/build/files index b261af69f1..1504c93c5f 100644 --- a/build/files +++ b/build/files @@ -321,7 +321,6 @@ QT_SRC= src/generic/fdrepdlg.cpp src/generic/filepickerg.cpp src/generic/fontpickerg.cpp - src/generic/icon.cpp src/generic/imaglist.cpp src/generic/paletteg.cpp src/generic/prntdlgg.cpp @@ -1300,7 +1299,6 @@ GTK_WIN32_HDR = wx/unix/fontutil.h GTK_LOWLEVEL_SRC = $(GTK_PLATFORM_SRC) - src/generic/icon.cpp src/generic/paletteg.cpp src/gtk/app.cpp src/gtk/assertdlg_gtk.cpp @@ -1518,7 +1516,6 @@ X11_LOWLEVEL_SRC = $(XWIN_LOWLEVEL_SRC) src/unix/displayx11.cpp src/unix/taskbarx11.cpp - src/generic/icon.cpp src/generic/textmeasure.cpp src/generic/timer.cpp src/x11/app.cpp @@ -1896,7 +1893,6 @@ DFB_LOWLEVEL_SRC = src/common/fontmgrcmn.cpp src/generic/caret.cpp src/generic/colour.cpp - src/generic/icon.cpp src/generic/mask.cpp src/generic/textmeasure.cpp src/dfb/app.cpp @@ -2042,7 +2038,6 @@ OSX_COMMON_SRC = src/generic/filepickerg.cpp src/generic/fontdlgg.cpp src/generic/fontpickerg.cpp - src/generic/icon.cpp src/generic/imaglist.cpp src/generic/listctrl.cpp src/generic/prntdlgg.cpp diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj index f3aff05037..c1048ee8c2 100644 --- a/build/osx/wxcocoa.xcodeproj/project.pbxproj +++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj @@ -161,7 +161,6 @@ 923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF3DF03795153E039B8F1F87 /* LineMarker.cxx */; }; 80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; }; 36DB80FD5B153E9099DB6912 /* imaggif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */; }; - 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; 800CFCEDBB7938338C65EEAD /* notifmsgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B233180893DB3328AF4847DA /* notifmsgcmn.cpp */; }; EAE02BA934B43EEE92C496C7 /* dcpsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA0945B20913754A54D0FD9 /* dcpsg.cpp */; }; C2CF6B59914A3183ADE84028 /* tif_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F1439BF6C3361296F05A33 /* tif_error.c */; }; @@ -740,7 +739,6 @@ 59BFB8C8310E37B39AF8B0D4 /* any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4867546E8B8D3C8683A23ED5 /* any.cpp */; }; F5DF7AF0FA9E371BB71EF799 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; }; 9FA6C4275F0D3E1A884ED562 /* pcre2_auto_possess.c in Sources */ = {isa = PBXBuildFile; fileRef = C3904351139F3F0DB4B72F94 /* pcre2_auto_possess.c */; }; - 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; 8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; }; F910C74E48823E0BA7F7885D /* graphicc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACAA6CE4A0934459F26B27C /* graphicc.cpp */; }; 8A9C3C04D00334418C3446FA /* dirdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0B0DC125AFFC322E8E496262 /* dirdlg.mm */; }; @@ -2566,7 +2564,6 @@ C5E5AB869065307F83E27DD3 /* htmlpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */; }; 68C300D096BF39239876D045 /* utils_base.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2ED0C0702D2734D9B08FC31D /* utils_base.mm */; }; 8292D346BFC33D6E8D3CDDC1 /* xh_sttxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */; }; - 01D4C5F2147F3942A7CE91AC /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; 3E6AA08E72A030D39D867D4D /* ScintillaWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */; }; EAE02BA934B43EEE92C496C8 /* dcpsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA0945B20913754A54D0FD9 /* dcpsg.cpp */; }; FEA741A9B6663A4C929893C3 /* aboutdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */; }; @@ -4908,7 +4905,6 @@ 24930711031D35288D28B04B /* choiccmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choiccmn.cpp; path = ../../src/common/choiccmn.cpp; sourceTree = SOURCE_ROOT; }; F7440859617F3B47AF4D3817 /* valgen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valgen.cpp; path = ../../src/common/valgen.cpp; sourceTree = SOURCE_ROOT; }; B1F3C70512D93501B0478F3E /* m_fonts.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_fonts.cpp; path = ../../src/html/m_fonts.cpp; sourceTree = SOURCE_ROOT; }; - F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/generic/icon.cpp; sourceTree = SOURCE_ROOT; }; 01BA6D45FE4C381493EB4372 /* validate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = validate.cpp; path = ../../src/common/validate.cpp; sourceTree = SOURCE_ROOT; }; 375FF97B202F3C359402D13E /* jdpostct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdpostct.c; path = ../../src/jpeg/jdpostct.c; sourceTree = SOURCE_ROOT; }; 168DB301ACC736FF96D7F581 /* file.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file.cpp; path = ../../src/common/file.cpp; sourceTree = SOURCE_ROOT; }; @@ -6153,7 +6149,6 @@ 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */, 071FEABEA61E3B559A47A7DB /* statusbr.cpp */, E9B31409EC6532FC83B0B957 /* textmeasure.cpp */, - F5DAF1F49F0F3F41A427A21D /* icon.cpp */, F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */, 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */, F4020D790AE7363CB29F1C2F /* anybutton.mm */, @@ -8138,7 +8133,6 @@ C005C2D547E735E9B081658F /* prntdlgg.cpp in Sources */, A1AF8FF873D6383996995ED1 /* statusbr.cpp in Sources */, 2E059BFE8E3B3D9299D5596A /* textmeasure.cpp in Sources */, - 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */, 750C716389AD3ADBABC9D68B /* statbmp_osx.cpp in Sources */, 1EDED99760B23A1999E75C14 /* imaglist.cpp in Sources */, 65AD3B31319C35F1AC9EC626 /* anybutton.mm in Sources */, @@ -8826,7 +8820,6 @@ C005C2D547E735E9B0816590 /* prntdlgg.cpp in Sources */, A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */, 2E059BFE8E3B3D9299D5596B /* textmeasure.cpp in Sources */, - 01D4C5F2147F3942A7CE91AC /* icon.cpp in Sources */, 750C716389AD3ADBABC9D68A /* statbmp_osx.cpp in Sources */, 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */, 65AD3B31319C35F1AC9EC627 /* anybutton.mm in Sources */, @@ -10032,7 +10025,6 @@ C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */, A1AF8FF873D6383996995ED0 /* statusbr.cpp in Sources */, 2E059BFE8E3B3D9299D55969 /* textmeasure.cpp in Sources */, - 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */, 750C716389AD3ADBABC9D689 /* statbmp_osx.cpp in Sources */, 1EDED99760B23A1999E75C13 /* imaglist.cpp in Sources */, 65AD3B31319C35F1AC9EC625 /* anybutton.mm in Sources */, diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj index 945b34ede5..539c221a39 100644 --- a/build/osx/wxiphone.xcodeproj/project.pbxproj +++ b/build/osx/wxiphone.xcodeproj/project.pbxproj @@ -636,7 +636,6 @@ 371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36E1DBA275AD325DB759C180 /* fontenum.cpp */; }; 0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; }; B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D46A36564C78312CAC538E93 /* srchctlg.cpp */; }; - 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; }; FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66411D54BAD338498AC59401 /* xh_scrol.cpp */; }; 020BBB417207393F8C60EFB6 /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */; }; @@ -1279,7 +1278,6 @@ 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filectrlcmn.cpp; path = ../../src/common/filectrlcmn.cpp; sourceTree = SOURCE_ROOT; }; 5A562F1DA7EA3B909BBB1465 /* LexModula.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexModula.cxx; path = ../../src/stc/lexilla/lexers/LexModula.cxx; sourceTree = SOURCE_ROOT; }; 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = SOURCE_ROOT; }; - F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/generic/icon.cpp; sourceTree = SOURCE_ROOT; }; 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPLM.cxx; path = ../../src/stc/lexilla/lexers/LexPLM.cxx; sourceTree = SOURCE_ROOT; }; EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filedlgg.cpp; path = ../../src/generic/filedlgg.cpp; sourceTree = SOURCE_ROOT; }; 9B862D1027C4367BBF44420F /* slider.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = slider.mm; path = ../../src/osx/iphone/slider.mm; sourceTree = SOURCE_ROOT; }; @@ -2490,7 +2488,6 @@ 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */, 071FEABEA61E3B559A47A7DB /* statusbr.cpp */, E9B31409EC6532FC83B0B957 /* textmeasure.cpp */, - F5DAF1F49F0F3F41A427A21D /* icon.cpp */, F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */, 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */, FE538F33A1423FC2AC9E45F3 /* regiong.cpp */, @@ -3266,7 +3263,6 @@ C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */, A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */, 2E059BFE8E3B3D9299D55969 /* textmeasure.cpp in Sources */, - 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */, 750C716389AD3ADBABC9D689 /* statbmp_osx.cpp in Sources */, 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */, 9519D59421513FF28FF717B6 /* regiong.cpp in Sources */, diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index 14fe70acfe..d231ad0bd8 100644 --- a/include/wx/generic/icon.h +++ b/include/wx/generic/icon.h @@ -19,9 +19,9 @@ class WXDLLIMPEXP_CORE wxIcon: public wxBitmap { public: - wxIcon(); + wxIcon() = default; - wxIcon(const char* const* bits); + wxIcon(const char* const* bits) : wxBitmap(bits) { } // For compatibility with wxMSW where desired size is sometimes required to // distinguish between multiple icons in a resource. @@ -49,7 +49,11 @@ public: // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no // ctors, assignment operators...), but it's ok to have such function - void CopyFromBitmap(const wxBitmap& bmp); + void CopyFromBitmap(const wxBitmap& bmp) + { + if ( &bmp != this ) + Ref(bmp); + } wxDECLARE_VARIANT_OBJECT_EXPORTED(wxIcon, WXDLLIMPEXP_CORE); diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 8681170c10..f38e712589 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -60,6 +60,11 @@ const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord); #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxPointList) +// If wxIcon is really a different class (which is currently only the case in +// wxMSW), this is done in its implementation file instead. +#ifdef wxICON_IS_BITMAP +wxIMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap); +#endif #if wxUSE_EXTENDED_RTTI diff --git a/src/generic/icon.cpp b/src/generic/icon.cpp deleted file mode 100644 index d2a1923832..0000000000 --- a/src/generic/icon.cpp +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/icon.cpp -// Purpose: wxIcon implementation for ports where it's same as wxBitmap -// Author: Julian Smart -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// wxIcon -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap); - -wxIcon::wxIcon(const char* const* bits) : - wxBitmap( bits ) -{ -} - -wxIcon::wxIcon() : wxBitmap() -{ -} - -void wxIcon::CopyFromBitmap(const wxBitmap& bmp) -{ - if ( &bmp != this ) - Ref(bmp); -}