moved wxIcon implementation for ports where it's identical to wxBitmap to generic...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index ca768eb48acdb4b6627499c8566224e0502ef18a..f3ce41d226decfdac3de4f9b530f9d2f7f8981ae 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1655,6 +1655,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/unix/fontutil.h \
        wx/unix/utilsx11.h \
+       wx/generic/icon.h \
        wx/generic/paletteg.h \
        wx/gtk1/app.h \
        wx/gtk1/bitmap.h \
@@ -1671,7 +1672,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__LOWLEVEL_HDR =  \
        wx/gtk1/dcscreen.h \
        wx/gtk1/dnd.h \
        wx/gtk1/font.h \
-       wx/gtk1/icon.h \
        wx/gtk1/minifram.h \
        wx/gtk1/pen.h \
        wx/gtk1/popupwin.h \
@@ -1686,6 +1686,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/unix/fontutil.h \
        wx/unix/utilsx11.h \
+       wx/generic/icon.h \
        wx/generic/paletteg.h \
        wx/gtk/app.h \
        wx/gtk/bitmap.h \
@@ -1702,7 +1703,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
        wx/gtk/dcscreen.h \
        wx/gtk/dnd.h \
        wx/gtk/font.h \
-       wx/gtk/icon.h \
        wx/gtk/minifram.h \
        wx/gtk/pen.h \
        wx/gtk/popupwin.h \
@@ -1716,6 +1716,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_MAC@LOWLEVEL_HDR = 
 COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
+       wx/generic/icon.h \
        wx/generic/timer.h \
        wx/mgl/app.h \
        wx/mgl/bitmap.h \
@@ -1730,7 +1731,6 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
        wx/mgl/dcscreen.h \
        wx/mgl/font.h \
        wx/mgl/fontutil.h \
-       wx/mgl/icon.h \
        wx/mgl/palette.h \
        wx/mgl/pen.h \
        wx/mgl/popupwin.h \
@@ -1767,6 +1767,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/unix/fontutil.h \
        wx/unix/utilsx11.h \
+       wx/generic/icon.h \
        wx/x11/app.h \
        wx/x11/bitmap.h \
        wx/x11/brush.h \
@@ -1784,7 +1785,6 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
        wx/x11/dcscreen.h \
        wx/x11/dnd.h \
        wx/x11/font.h \
-       wx/x11/icon.h \
        wx/x11/minifram.h \
        wx/x11/palette.h \
        wx/x11/pen.h \
@@ -3533,6 +3533,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS =  \
        monodll_fontutil.o \
        monodll_utilsx11.o \
        monodll_displayx11.o \
+       monodll_icon.o \
        monodll_paletteg.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -3551,7 +3552,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS =  \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_gsockgtk.o \
-       monodll_icon.o \
        monodll_main.o \
        monodll_minifram.o \
        monodll_pen.o \
@@ -3573,6 +3573,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
        monodll_fontutil.o \
        monodll_utilsx11.o \
        monodll_displayx11.o \
+       monodll_icon.o \
        monodll_paletteg.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -3591,7 +3592,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_gsockgtk.o \
-       monodll_icon.o \
        monodll_main.o \
        monodll_minifram.o \
        monodll_pen.o \
@@ -3609,6 +3609,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
        monodll_caret.o \
+       monodll_icon.o \
        monodll_timer.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -3627,7 +3628,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
        monodll_fontenum.o \
        monodll_fontutil.o \
        monodll_gdiobj.o \
-       monodll_icon.o \
        monodll_palette.o \
        monodll_pen.o \
        monodll_region.o \
@@ -3753,6 +3753,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
        monodll_fontutil.o \
        monodll_utilsx11.o \
        monodll_displayx11.o \
+       monodll_icon.o \
        monodll_timer.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -3770,7 +3771,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_gsockx11.o \
-       monodll_icon.o \
        monodll_minifram.o \
        monodll_nanox.o \
        monodll_palette.o \
@@ -4332,6 +4332,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_fontutil.o \
        monodll_utilsx11.o \
        monodll_displayx11.o \
+       monodll_icon.o \
        monodll_paletteg.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -4350,7 +4351,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_gsockgtk.o \
-       monodll_icon.o \
        monodll_main.o \
        monodll_minifram.o \
        monodll_pen.o \
@@ -4372,6 +4372,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_fontutil.o \
        monodll_utilsx11.o \
        monodll_displayx11.o \
+       monodll_icon.o \
        monodll_paletteg.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -4390,7 +4391,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_gsockgtk.o \
-       monodll_icon.o \
        monodll_main.o \
        monodll_minifram.o \
        monodll_pen.o \
@@ -4408,6 +4408,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_caret.o \
+       monodll_icon.o \
        monodll_timer.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -4426,7 +4427,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_fontenum.o \
        monodll_fontutil.o \
        monodll_gdiobj.o \
-       monodll_icon.o \
        monodll_palette.o \
        monodll_pen.o \
        monodll_region.o \
@@ -4552,6 +4552,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_fontutil.o \
        monodll_utilsx11.o \
        monodll_displayx11.o \
+       monodll_icon.o \
        monodll_timer.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -4569,7 +4570,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_gsockx11.o \
-       monodll_icon.o \
        monodll_minifram.o \
        monodll_nanox.o \
        monodll_palette.o \
@@ -5195,6 +5195,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_fontutil.o \
        monolib_utilsx11.o \
        monolib_displayx11.o \
+       monolib_icon.o \
        monolib_paletteg.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -5213,7 +5214,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_gsockgtk.o \
-       monolib_icon.o \
        monolib_main.o \
        monolib_minifram.o \
        monolib_pen.o \
@@ -5235,6 +5235,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_fontutil.o \
        monolib_utilsx11.o \
        monolib_displayx11.o \
+       monolib_icon.o \
        monolib_paletteg.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -5253,7 +5254,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_gsockgtk.o \
-       monolib_icon.o \
        monolib_main.o \
        monolib_minifram.o \
        monolib_pen.o \
@@ -5272,6 +5272,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_caret.o \
+       monolib_icon.o \
        monolib_timer.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -5290,7 +5291,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_fontenum.o \
        monolib_fontutil.o \
        monolib_gdiobj.o \
-       monolib_icon.o \
        monolib_palette.o \
        monolib_pen.o \
        monolib_region.o \
@@ -5416,6 +5416,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_fontutil.o \
        monolib_utilsx11.o \
        monolib_displayx11.o \
+       monolib_icon.o \
        monolib_timer.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -5433,7 +5434,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_gsockx11.o \
-       monolib_icon.o \
        monolib_minifram.o \
        monolib_nanox.o \
        monolib_palette.o \
@@ -5995,6 +5995,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_fontutil.o \
        monolib_utilsx11.o \
        monolib_displayx11.o \
+       monolib_icon.o \
        monolib_paletteg.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -6013,7 +6014,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_gsockgtk.o \
-       monolib_icon.o \
        monolib_main.o \
        monolib_minifram.o \
        monolib_pen.o \
@@ -6035,6 +6035,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_fontutil.o \
        monolib_utilsx11.o \
        monolib_displayx11.o \
+       monolib_icon.o \
        monolib_paletteg.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -6053,7 +6054,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_gsockgtk.o \
-       monolib_icon.o \
        monolib_main.o \
        monolib_minifram.o \
        monolib_pen.o \
@@ -6072,6 +6072,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_caret.o \
+       monolib_icon.o \
        monolib_timer.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -6090,7 +6091,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_fontenum.o \
        monolib_fontutil.o \
        monolib_gdiobj.o \
-       monolib_icon.o \
        monolib_palette.o \
        monolib_pen.o \
        monolib_region.o \
@@ -6216,6 +6216,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_fontutil.o \
        monolib_utilsx11.o \
        monolib_displayx11.o \
+       monolib_icon.o \
        monolib_timer.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -6233,7 +6234,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_gsockx11.o \
-       monolib_icon.o \
        monolib_minifram.o \
        monolib_nanox.o \
        monolib_palette.o \
@@ -7076,6 +7076,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_fontutil.o \
        coredll_utilsx11.o \
        coredll_displayx11.o \
+       coredll_icon.o \
        coredll_paletteg.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -7094,7 +7095,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_gsockgtk.o \
-       coredll_icon.o \
        coredll_main.o \
        coredll_minifram.o \
        coredll_pen.o \
@@ -7116,6 +7116,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_fontutil.o \
        coredll_utilsx11.o \
        coredll_displayx11.o \
+       coredll_icon.o \
        coredll_paletteg.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -7134,7 +7135,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_gsockgtk.o \
-       coredll_icon.o \
        coredll_main.o \
        coredll_minifram.o \
        coredll_pen.o \
@@ -7153,6 +7153,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
 @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_caret.o \
+       coredll_icon.o \
        coredll_timer.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -7171,7 +7172,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_fontenum.o \
        coredll_fontutil.o \
        coredll_gdiobj.o \
-       coredll_icon.o \
        coredll_palette.o \
        coredll_pen.o \
        coredll_region.o \
@@ -7297,6 +7297,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_fontutil.o \
        coredll_utilsx11.o \
        coredll_displayx11.o \
+       coredll_icon.o \
        coredll_timer.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -7314,7 +7315,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_gsockx11.o \
-       coredll_icon.o \
        coredll_minifram.o \
        coredll_nanox.o \
        coredll_palette.o \
@@ -7876,6 +7876,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_fontutil.o \
        coredll_utilsx11.o \
        coredll_displayx11.o \
+       coredll_icon.o \
        coredll_paletteg.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -7894,7 +7895,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_gsockgtk.o \
-       coredll_icon.o \
        coredll_main.o \
        coredll_minifram.o \
        coredll_pen.o \
@@ -7916,6 +7916,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_fontutil.o \
        coredll_utilsx11.o \
        coredll_displayx11.o \
+       coredll_icon.o \
        coredll_paletteg.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -7934,7 +7935,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_gsockgtk.o \
-       coredll_icon.o \
        coredll_main.o \
        coredll_minifram.o \
        coredll_pen.o \
@@ -7953,6 +7953,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
 @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_caret.o \
+       coredll_icon.o \
        coredll_timer.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -7971,7 +7972,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_fontenum.o \
        coredll_fontutil.o \
        coredll_gdiobj.o \
-       coredll_icon.o \
        coredll_palette.o \
        coredll_pen.o \
        coredll_region.o \
@@ -8097,6 +8097,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_fontutil.o \
        coredll_utilsx11.o \
        coredll_displayx11.o \
+       coredll_icon.o \
        coredll_timer.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -8114,7 +8115,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_gsockx11.o \
-       coredll_icon.o \
        coredll_minifram.o \
        coredll_nanox.o \
        coredll_palette.o \
@@ -8435,6 +8435,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_fontutil.o \
        corelib_utilsx11.o \
        corelib_displayx11.o \
+       corelib_icon.o \
        corelib_paletteg.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -8453,7 +8454,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_gsockgtk.o \
-       corelib_icon.o \
        corelib_main.o \
        corelib_minifram.o \
        corelib_pen.o \
@@ -8475,6 +8475,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_fontutil.o \
        corelib_utilsx11.o \
        corelib_displayx11.o \
+       corelib_icon.o \
        corelib_paletteg.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -8493,7 +8494,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_gsockgtk.o \
-       corelib_icon.o \
        corelib_main.o \
        corelib_minifram.o \
        corelib_pen.o \
@@ -8512,6 +8512,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
 @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_caret.o \
+       corelib_icon.o \
        corelib_timer.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -8530,7 +8531,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_fontenum.o \
        corelib_fontutil.o \
        corelib_gdiobj.o \
-       corelib_icon.o \
        corelib_palette.o \
        corelib_pen.o \
        corelib_region.o \
@@ -8656,6 +8656,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_fontutil.o \
        corelib_utilsx11.o \
        corelib_displayx11.o \
+       corelib_icon.o \
        corelib_timer.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -8673,7 +8674,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_gsockx11.o \
-       corelib_icon.o \
        corelib_minifram.o \
        corelib_nanox.o \
        corelib_palette.o \
@@ -9235,6 +9235,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_fontutil.o \
        corelib_utilsx11.o \
        corelib_displayx11.o \
+       corelib_icon.o \
        corelib_paletteg.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -9253,7 +9254,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_gsockgtk.o \
-       corelib_icon.o \
        corelib_main.o \
        corelib_minifram.o \
        corelib_pen.o \
@@ -9275,6 +9275,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_fontutil.o \
        corelib_utilsx11.o \
        corelib_displayx11.o \
+       corelib_icon.o \
        corelib_paletteg.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -9293,7 +9294,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_gsockgtk.o \
-       corelib_icon.o \
        corelib_main.o \
        corelib_minifram.o \
        corelib_pen.o \
@@ -9312,6 +9312,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
 @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_caret.o \
+       corelib_icon.o \
        corelib_timer.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -9330,7 +9331,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_fontenum.o \
        corelib_fontutil.o \
        corelib_gdiobj.o \
-       corelib_icon.o \
        corelib_palette.o \
        corelib_pen.o \
        corelib_region.o \
@@ -9456,6 +9456,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_fontutil.o \
        corelib_utilsx11.o \
        corelib_displayx11.o \
+       corelib_icon.o \
        corelib_timer.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -9473,7 +9474,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_gsockx11.o \
-       corelib_icon.o \
        corelib_minifram.o \
        corelib_nanox.o \
        corelib_palette.o \
@@ -12768,6 +12768,36 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_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_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_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_MGL_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@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_WINCE_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -13242,36 +13272,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/icon.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_icon.o: $(srcdir)/src/gtk1/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/icon.cpp
-
-@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_WINCE_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_icon.o: $(srcdir)/src/x11/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/icon.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_icon.o: $(srcdir)/src/mgl/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/icon.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
 
@@ -16650,6 +16650,36 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_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_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_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_MGL_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@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_WINCE_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -17124,36 +17154,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/icon.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_icon.o: $(srcdir)/src/gtk1/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/icon.cpp
-
-@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_WINCE_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_icon.o: $(srcdir)/src/x11/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/icon.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_icon.o: $(srcdir)/src/mgl/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/icon.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
 
@@ -20910,6 +20910,36 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_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_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_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_MGL_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@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_WINCE_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/cocoa/icon.mm $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -21384,36 +21414,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_icon.o: $(srcdir)/src/gtk/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/icon.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_icon.o: $(srcdir)/src/gtk1/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/icon.cpp
-
-@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_WINCE_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_icon.o: $(srcdir)/src/x11/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/icon.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_icon.o: $(srcdir)/src/mgl/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/icon.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/cocoa/icon.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
 
@@ -23730,6 +23730,36 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_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_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_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_MGL_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
+@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_WINCE_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/cocoa/icon.mm $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -24204,36 +24234,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_icon.o: $(srcdir)/src/gtk/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/icon.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_icon.o: $(srcdir)/src/gtk1/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/icon.cpp
-
-@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_WINCE_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_icon.o: $(srcdir)/src/x11/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/icon.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_icon.o: $(srcdir)/src/mgl/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/icon.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/mac/carbon/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/icon.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/cocoa/icon.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b2c3756c6e04da7ff1e17bde748ee0d3ef99d931..2f6bdbf46893aab85ac280d46c293b7a286008c1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -873,6 +873,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GTK_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/gtk/app.cpp
     src/gtk/bitmap.cpp
@@ -891,7 +892,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/font.cpp
     src/gtk/gdiobj.cpp
     src/gtk/gsockgtk.cpp
-    src/gtk/icon.cpp
     src/gtk/main.cpp
     src/gtk/minifram.cpp
     src/gtk/pen.cpp
@@ -908,6 +908,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk/app.h
     wx/gtk/bitmap.h
@@ -924,7 +925,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/dcscreen.h
     wx/gtk/dnd.h
     wx/gtk/font.h
-    wx/gtk/icon.h
     wx/gtk/minifram.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
@@ -1051,6 +1051,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GTK1_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/gtk1/app.cpp
     src/gtk1/bitmap.cpp
@@ -1069,7 +1070,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/font.cpp
     src/gtk1/gdiobj.cpp
     src/gtk1/gsockgtk.cpp
-    src/gtk1/icon.cpp
     src/gtk1/main.cpp
     src/gtk1/minifram.cpp
     src/gtk1/pen.cpp
@@ -1086,6 +1086,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="GTK1_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk1/app.h
     wx/gtk1/bitmap.h
@@ -1102,7 +1103,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk1/dcscreen.h
     wx/gtk1/dnd.h
     wx/gtk1/font.h
-    wx/gtk1/icon.h
     wx/gtk1/minifram.h
     wx/gtk1/pen.h
     wx/gtk1/popupwin.h
@@ -1367,6 +1367,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
@@ -1384,7 +1385,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/font.cpp
     src/x11/gdiobj.cpp
     src/x11/gsockx11.cpp
-    src/x11/icon.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
@@ -1400,6 +1400,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
@@ -1417,7 +1418,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/dcscreen.h
     wx/x11/dnd.h
     wx/x11/font.h
-    wx/x11/icon.h
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h
@@ -1722,6 +1722,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="MGL_LOWLEVEL_SRC" hints="files">
     src/generic/caret.cpp
+    src/generic/icon.cpp
     src/generic/timer.cpp
     src/mgl/app.cpp
     src/mgl/bitmap.cpp
@@ -1740,7 +1741,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mgl/fontenum.cpp
     src/mgl/fontutil.cpp
     src/mgl/gdiobj.cpp
-    src/mgl/icon.cpp
     src/mgl/palette.cpp
     src/mgl/pen.cpp
     src/mgl/region.cpp
@@ -1751,6 +1751,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MGL_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
+    wx/generic/icon.h
     wx/generic/timer.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
@@ -1765,7 +1766,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mgl/dcscreen.h
     wx/mgl/font.h
     wx/mgl/fontutil.h
-    wx/mgl/icon.h
     wx/mgl/palette.h
     wx/mgl/pen.h
     wx/mgl/popupwin.h

diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h
new file mode 100644 (file)
index 0000000..9a6976f
--- /dev/null
+++ b/include/wx/generic/icon.h
@@ -0,0 +1,61 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/generic/icon.h
+// Purpose:     wxIcon implementation for ports where it's same as wxBitmap
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GENERIC_ICON_H_
+#define _WX_GENERIC_ICON_H_
+
+#include "wx/bitmap.h"
+
+//-----------------------------------------------------------------------------
+// wxIcon
+//-----------------------------------------------------------------------------
+
+#ifndef wxICON_DEFAULT_BITMAP_TYPE
+#define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_XPM
+#endif
+
+class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
+{
+public:
+    wxIcon();
+
+    wxIcon( const char **bits, int width=-1, int height=-1 );
+    wxIcon( char **bits, int width=-1, int height=-1 );
+
+    // For compatibility with wxMSW where desired size is sometimes required to
+    // distinguish between multiple icons in a resource.
+    wxIcon( const wxString& filename,
+            wxBitmapType type = wxICON_DEFAULT_BITMAP_TYPE,
+            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
+        wxBitmap(filename, type)
+    {
+    }
+
+    wxIcon(const wxIconLocation& loc)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
+    {
+    }
+
+    bool operator==(const wxIcon& icon) const
+        { return m_refData == icon.m_refData; }
+    bool operator!=(const wxIcon& icon) const
+        { return !(*this == icon); }
+
+    // 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);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)
+};
+
+#endif // _WX_GENERIC_ICON_H_

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
deleted file mode 100644 (file)
index 9cb8800..0000000
--- a/include/wx/gtk/icon.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        icon.h
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKICONH__
-#define __GTKICONH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxIcon;
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
-{
-public:
-    wxIcon();
-    wxIcon( const char **bits, int width=-1, int height=-1 );
-
-    // For compatibility with wxMSW where desired size is sometimes required to
-    // distinguish between multiple icons in a resource.
-    wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM,
-            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
-        wxBitmap(filename, type)
-    {
-    }
-    wxIcon( char **bits, int width=-1, int height=-1 );
-
-    wxIcon(const wxIconLocation& loc)
-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
-    {
-    }
-
-    bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
-    bool operator!=(const wxIcon& icon) const { return !(*this == icon); }
-
-    // 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);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-};
-
-
-#endif // __GTKICONH__

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
deleted file mode 100644 (file)
index f93b45a..0000000
--- a/include/wx/gtk1/icon.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk1/icon.h
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKICONH__
-#define __GTKICONH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxIcon;
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
-{
-public:
-    wxIcon();
-    wxIcon( const char **bits, int width=-1, int height=-1 );
-
-    // For compatibility with wxMSW where desired size is sometimes required to
-    // distinguish between multiple icons in a resource.
-    wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM,
-            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
-        wxBitmap(filename, type)
-    {
-    }
-    wxIcon( char **bits, int width=-1, int height=-1 );
-
-    wxIcon(const wxIconLocation& loc)
-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
-    {
-    }
-
-    bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
-    bool operator!=(const wxIcon& icon) const { return !(*this == icon); }
-
-    // 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);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-};
-
-
-#endif // __GTKICONH__

diff --git a/include/wx/icon.h b/include/wx/icon.h
index bcf9c53ca8df4b125625a5a376e9b217d7bf56aa..50dda58d637c92d934548a46f8b670006ea771ec 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -21,13 +21,14 @@
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK20__)
-  #include "wx/gtk/icon.h"
+  #include "wx/generic/icon.h"
 #elif defined(__WXGTK__)
-  #include "wx/gtk1/icon.h"
+  #include "wx/generic/icon.h"
 #elif defined(__WXX11__)
-  #include "wx/x11/icon.h"
+  #include "wx/generic/icon.h"
 #elif defined(__WXMGL__)
-  #include "wx/mgl/icon.h"
+  #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE
+  #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
 #elif defined(__WXCOCOA__)

diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h
deleted file mode 100644 (file)
index 03d1c43..0000000
--- a/include/wx/mgl/icon.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        icon.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_ICON_H__
-#define __WX_ICON_H__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxIcon;
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxIcon: public wxBitmap
-{
-public:
-    wxIcon() : wxBitmap() {}
-    wxIcon(const char **bits, int width=-1, int height=-1);
-    wxIcon(char **bits, int width=-1, int height=-1);
-
-    // For compatibility with wxMSW where desired size is sometimes required to
-    // distinguish between multiple icons in a resource.
-    wxIcon(const wxString& filename, int type = wxBITMAP_TYPE_ICO_RESOURCE,
-           int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
-           wxBitmap(filename, (wxBitmapType)type) {}
-
-    wxIcon(const wxIconLocation& loc)
-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
-    {
-    }
-
-    bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
-    bool operator!=(const wxIcon& icon) const { return !(*this == icon); }
-
-    // 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);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-};
-
-
-#endif // __WX_ICON_H__

diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h
deleted file mode 100644 (file)
index 50272ab..0000000
--- a/include/wx/x11/icon.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        icon.h
-// Purpose:     wxIcon class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ICON_H_
-#define _WX_ICON_H_
-
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
-{
-public:
-    wxIcon();
-    wxIcon( const char **bits, int width=-1, int height=-1 );
-
-    // For compatibility with wxMSW where desired size is sometimes required to
-    // distinguish between multiple icons in a resource.
-    wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM, 
-            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
-        wxBitmap(filename, type)
-    {
-    }
-    wxIcon( char **bits, int width=-1, int height=-1 );
-
-    wxIcon(const wxIconLocation& loc)
-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
-    {
-    }
-
-    bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
-    bool operator!=(const wxIcon& icon) const { return !(*this == icon); }
-
-    // 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);
-  
-private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-};
-
-
-#endif
-// _WX_ICON_H_

diff --git a/src/generic/icon.cpp b/src/generic/icon.cpp
new file mode 100644 (file)
index 0000000..0e79576
--- /dev/null
+++ b/src/generic/icon.cpp
@@ -0,0 +1,45 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/icon.cpp
+// Purpose:     wxIcon implementation for ports where it's same as wxBitmap
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/icon.h"
+
+//-----------------------------------------------------------------------------
+// wxIcon
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+
+wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+    wxBitmap( bits )
+{
+}
+
+wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+    wxBitmap( bits )
+{
+}
+
+wxIcon::wxIcon() :  wxBitmap()
+{
+}
+
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
deleted file mode 100644 (file)
index 0d82d68..0000000
--- a/src/gtk/icon.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#include "wx/icon.h"
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
-
-wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits )
-{
-}
-
-wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits )
-{
-}
-
-wxIcon::wxIcon() :  wxBitmap()
-{
-}
-
-void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
-{
-    wxIcon *icon = (wxIcon*)(&bmp);
-    *this = *icon;
-}

diff --git a/src/gtk1/icon.cpp b/src/gtk1/icon.cpp
deleted file mode 100644 (file)
index 0d82d68..0000000
--- a/src/gtk1/icon.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#include "wx/icon.h"
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
-
-wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits )
-{
-}
-
-wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits )
-{
-}
-
-wxIcon::wxIcon() :  wxBitmap()
-{
-}
-
-void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
-{
-    wxIcon *icon = (wxIcon*)(&bmp);
-    *this = *icon;
-}

diff --git a/src/mgl/icon.cpp b/src/mgl/icon.cpp
deleted file mode 100644 (file)
index d1e2175..0000000
--- a/src/mgl/icon.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/icon.h"
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-
-wxIcon::wxIcon(const char **bits, int WXUNUSED(width), int WXUNUSED(height)) :
-    wxBitmap(bits)
-{
-}
-
-wxIcon::wxIcon(char **bits, int WXUNUSED(width), int WXUNUSED(height)) :
-    wxBitmap(bits)
-{
-}
-
-void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
-{
-    wxIcon *icon = (wxIcon*)(&bmp);
-    *this = *icon;
-}
-

diff --git a/src/x11/icon.cpp b/src/x11/icon.cpp
deleted file mode 100644 (file)
index ae063ad..0000000
--- a/src/x11/icon.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/x11/icon.cpp
-// Purpose:     wxIcon class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#include "wx/icon.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif
-
-#include "wx/x11/private.h"
-
-//-----------------------------------------------------------------------------
-// wxIcon
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
-
-wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits )
-{
-}
-
-wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits )
-{
-}
-
-wxIcon::wxIcon() :  wxBitmap()
-{
-}
-
-void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
-{
-    wxIcon *icon = (wxIcon*)(&bmp);
-    *this = *icon;
-}