Add wxBITMAP_PNG() macro similar to wxBITMAP() but for PNG images.

Just as wxBITMAP() provides a portable way of loading bitmaps from either Windows BMP resources or embedded XPM data depending on the platform, wxBITMAP_PNG() hides the difference between loading bitmaps from PNG resources under Windows and embedded PNG data elsewhere. Also add wxBITMAP_PNG_FROM_DATA() macro which always loads PNG data from memory: it's needed anyhow as part of wxBITMAP_PNG() implementation and some people may prefer to always use it under all platforms. Finally modify the image sample to demonstrate loading PNG images from both resources and memory. This involved creation of a new Windows .rc file for it and copying its data files to Resources bundle directory under OS X. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-13 17:15:25 +00:00
parent 20e6714a67
commit c3f641cb5e
20 changed files with 328 additions and 36 deletions
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -48,10 +48,10 @@ IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
-	$(__image___win32rc) \
 	$(__image_os2_lib_res) \
 	image_image.o \
-	image_canvas.o
+	image_canvas.o \
+	$(__image___win32rc)

 ### Conditionally set variables: ###

@@ -88,7 +88,6 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q
@COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__image___win32rc = image_sample_rc.o
@COND_PLATFORM_OS2_1@__image_os2_lib_res = \
@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \
@@ -110,6 +109,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+@COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -155,7 +155,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
 	$(__image___mac_setfilecmd)
 	$(__image___os2_emxbindcmd)

-@COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns $(srcdir)/cursor.png
@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents
@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents/MacOS
@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents/Resources
@@ -174,6 +174,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
@COND_PLATFORM_MACOSX_1@	
@COND_PLATFORM_MACOSX_1@	
@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(srcdir)/cursor.png image.app/Contents/Resources

@COND_PLATFORM_MACOSX_1@image_bundle: $(____image_BUNDLE_TGT_REF_DEP)

@@ -189,15 +190,15 @@ data:
 	esac; \
 	done

-image_sample_rc.o: $(srcdir)/../../samples/sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
 image_image.o: $(srcdir)/image.cpp
 	$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/image.cpp

 image_canvas.o: $(srcdir)/canvas.cpp
 	$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/canvas.cpp

+image_image_rc.o: $(srcdir)/image.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+

 # Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d
--- a/samples/image/canvas.cpp
+++ b/samples/image/canvas.cpp
@@ -35,6 +35,7 @@

 #include "smile.xbm"
 #include "smile.xpm"
+#include "cursor_png.c"

 #include "canvas.h"

@@ -376,6 +377,19 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,

        free(data);
    }
+
+    // This macro loads PNG from either resources on the platforms that support
+    // this (Windows and OS X) or from in-memory data (coming from cursor_png.c
+    // included above in our case).
+    my_png_from_res = wxBITMAP_PNG(cursor);
+
+    // This one always loads PNG from memory but exists for consistency with
+    // the above one and also because it frees you from the need to specify the
+    // length explicitly, without it you'd have to do it and also spell the
+    // array name in full, like this:
+    //
+    // my_png_from_mem = wxBitmap::NewFromPNGData(cursor_png, WXSIZEOF(cursor_png));
+    my_png_from_mem = wxBITMAP_PNG_FROM_DATA(cursor);
 }

 MyCanvas::~MyCanvas()
@@ -635,6 +649,13 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
            dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
        }
    }
+
+    dc.DrawText("PNG from resources", 30, 2460);
+    if ( my_png_from_res.IsOk() )
+        dc.DrawBitmap(my_png_from_res, 30, 2480, true);
+    dc.DrawText("PNG from memory", 230, 2460);
+    if ( my_png_from_mem.IsOk() )
+        dc.DrawBitmap(my_png_from_mem, 230, 2480, true);
 }

 void MyCanvas::CreateAntiAliasedBitmap()
--- a/samples/image/canvas.h
+++ b/samples/image/canvas.h
@@ -38,6 +38,8 @@ public:
    wxBitmap  my_horse_ico16;
    wxBitmap  my_horse_ico;
    wxBitmap  my_horse_cur;
+    wxBitmap  my_png_from_res,
+              my_png_from_mem;

    wxBitmap  my_smile_xbm;
    wxBitmap  my_square;
--- a/samples/image/cursor_png.c
+++ b/samples/image/cursor_png.c
@@ -0,0 +1,72 @@
+/*
+    This file was created using the following command:
+
+    ./misc/scripts/png2c.py samples/image/cursor.png > samples/image/cursor_png.c
+
+    (and then edited to add this comment).
+ */
+
+/* cursor.png - 489 bytes */
+static const unsigned char cursor_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+  0xf4, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
+  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
+  0x88, 0x00, 0x00, 0x01, 0xa0, 0x49, 0x44, 0x41,
+  0x54, 0x58, 0x85, 0xc5, 0x97, 0x5b, 0xb2, 0x84,
+  0x20, 0x0c, 0x44, 0x1b, 0xeb, 0xee, 0x48, 0xd6,
+  0x24, 0x6b, 0xc2, 0x35, 0xc1, 0x9a, 0x72, 0x3f,
+  0x24, 0x4c, 0x80, 0x80, 0x8f, 0x51, 0x27, 0x55,
+  0xd6, 0x94, 0x32, 0xda, 0x27, 0x1d, 0x08, 0x0a,
+  0x00, 0x44, 0xc1, 0x13, 0x00, 0x32, 0x00, 0xde,
+  0x3e, 0x26, 0xa4, 0xa0, 0xe0, 0x41, 0x00, 0xe1,
+  0xe5, 0x98, 0xe4, 0xc9, 0x2f, 0x20, 0x26, 0x00,
+  0x30, 0xd6, 0xfd, 0x0c, 0x62, 0x32, 0x5b, 0x29,
+  0x8a, 0x78, 0x13, 0x22, 0x97, 0x40, 0xba, 0x20,
+  0x21, 0x9e, 0x06, 0x31, 0x9c, 0x3e, 0x0b, 0x51,
+  0xf0, 0xed, 0x9f, 0xac, 0x83, 0xe6, 0xd4, 0x1d,
+  0xf1, 0x71, 0x20, 0x09, 0xd4, 0x4e, 0x30, 0xd4,
+  0x53, 0x4e, 0x98, 0x3a, 0x2d, 0xcd, 0x89, 0x18,
+  0x23, 0x00, 0xc0, 0xba, 0xb5, 0x80, 0x7d, 0x04,
+  0x40, 0x42, 0x04, 0xbf, 0x14, 0xc2, 0x0c, 0xc5,
+  0x2e, 0xdd, 0x02, 0xd2, 0xeb, 0x50, 0x1b, 0xc7,
+  0x76, 0x50, 0xf0, 0x14, 0xfc, 0x52, 0x9c, 0xdf,
+  0xd5, 0x3d, 0xff, 0x7a, 0xd9, 0x73, 0xc6, 0x31,
+  0xc6, 0x9c, 0xb1, 0x2c, 0x4b, 0xbe, 0xb6, 0x41,
+  0x5c, 0x76, 0xa2, 0x00, 0x90, 0xf5, 0xdf, 0x15,
+  0x2e, 0xaf, 0x5d, 0x86, 0x28, 0xe6, 0x00, 0x01,
+  0x14, 0xfc, 0xd2, 0xd4, 0xbc, 0x27, 0x5c, 0x3c,
+  0xe8, 0xe2, 0x52, 0x6d, 0x00, 0xce, 0x0a, 0x03,
+  0x00, 0xe6, 0x19, 0x10, 0x8e, 0x9d, 0x01, 0x69,
+  0xe6, 0xc0, 0x29, 0x61, 0x21, 0x8e, 0x79, 0x96,
+  0xab, 0xe4, 0x70, 0x49, 0xa6, 0xd1, 0x60, 0xb7,
+  0x2b, 0xca, 0x66, 0x95, 0xc4, 0xf3, 0x2f, 0xce,
+  0x35, 0xae, 0x21, 0xc0, 0x50, 0x58, 0xc6, 0x17,
+  0x10, 0x87, 0x01, 0x34, 0xa0, 0x3b, 0x20, 0x0e,
+  0x01, 0x18, 0xeb, 0x10, 0xfc, 0x92, 0x3b, 0xa3,
+  0x1a, 0x52, 0x5c, 0x81, 0xe8, 0x81, 0x74, 0x57,
+  0x41, 0x6f, 0x12, 0xc6, 0x18, 0xf3, 0x32, 0x6d,
+  0xc6, 0x6b, 0x08, 0x25, 0x91, 0x7a, 0x72, 0xaa,
+  0x0e, 0x70, 0xc6, 0xf9, 0x26, 0x51, 0xff, 0x39,
+  0x65, 0xc6, 0xe3, 0x51, 0x0a, 0x29, 0x0e, 0xc8,
+  0xd0, 0x4a, 0x52, 0x00, 0x48, 0x3a, 0xeb, 0xd6,
+  0x2c, 0x52, 0xc3, 0xc8, 0x52, 0x48, 0x37, 0xf6,
+  0x1c, 0xd0, 0x20, 0xd4, 0xdd, 0x10, 0x40, 0x43,
+  0xca, 0x1d, 0x92, 0x2d, 0x97, 0x5b, 0x74, 0xf0,
+  0x4b, 0x76, 0x66, 0x24, 0x5e, 0x24, 0x9b, 0xca,
+  0xd1, 0x05, 0xd8, 0x03, 0x92, 0x20, 0x0d, 0xc4,
+  0xc1, 0x30, 0xd6, 0xf5, 0x1d, 0x38, 0x0a, 0x33,
+  0xda, 0x1b, 0xf6, 0xba, 0xa8, 0xb1, 0xae, 0xdf,
+  0x8a, 0x87, 0x37, 0xa6, 0xb9, 0x42, 0x00, 0x75,
+  0x9b, 0x13, 0x36, 0x77, 0xf6, 0x5c, 0xb9, 0xdc,
+  0x88, 0x18, 0x44, 0x3b, 0x78, 0xdc, 0xba, 0xb5,
+  0x5c, 0x25, 0xda, 0x33, 0x1e, 0x79, 0xd5, 0x4d,
+  0x21, 0x5f, 0xed, 0x6a, 0x27, 0x78, 0x12, 0x7e,
+  0xe5, 0xc0, 0x5e, 0xb0, 0x1b, 0x23, 0x27, 0x1e,
+  0x75, 0x40, 0x46, 0xbd, 0x8a, 0xf2, 0x67, 0xc0,
+  0x5b, 0x00, 0xbd, 0xf8, 0x07, 0x6a, 0xb9, 0x1e,
+  0x64, 0x99, 0x1e, 0x1f, 0x6c, 0x00, 0x00, 0x00,
+  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+  0x82};
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -3,6 +3,12 @@

 <makefile>

+    <!--
+        This file is loaded using wxBITMAP_TYPE_PNG_RESOURCE and so must be
+        copied to the resources directory under Mac.
+     -->
+    <set var="BUNDLE_RESOURCES">$(SRCDIR)/cursor.png</set>
+
    <include file="../../build/bakefiles/common_samples.bkl"/>

    <exe id="image" template="wx_sample" template_append="wx_append">
@@ -10,6 +16,7 @@
        <headers>canvas.h</headers>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
+        <win32-res>image.rc</win32-res>
    </exe>

    <wx-data id="data">
--- a/samples/image/image.dsp
+++ b/samples/image/image.dsp
@@ -260,7 +260,7 @@ SOURCE=.\image.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\..\..\samples\sample.rc
+SOURCE=.\image.rc
 # End Source File
 # End Group
 # Begin Group "Header Files"
--- a/samples/image/image.rc
+++ b/samples/image/image.rc
@@ -0,0 +1,5 @@
+#include "../sample.rc"
+
+// The exact PNG file used here doesn't really matter but it's the same one we
+// embed into the sample code too.
+cursor RCDATA "cursor.png"
--- a/samples/image/image_vc7.vcproj
+++ b/samples/image/image_vc7.vcproj
@@ -561,7 +561,7 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath="..\..\samples\sample.rc">
+				RelativePath=".\image.rc">
 			</File>
 		</Filter>
 	</Files>
--- a/samples/image/image_vc8.vcproj
+++ b/samples/image/image_vc8.vcproj
@@ -828,7 +828,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\..\samples\sample.rc"
+				RelativePath=".\image.rc"
 				>
 			</File>
 		</Filter>
--- a/samples/image/image_vc9.vcproj
+++ b/samples/image/image_vc9.vcproj
@@ -800,7 +800,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\..\samples\sample.rc"
+				RelativePath=".\image.rc"
 				>
 			</File>
 		</Filter>
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -234,21 +234,20 @@ clean:
 	-if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf
 	-if exist $(OBJS)\image.ils del $(OBJS)\image.ils

-$(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_sample.res
+$(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_image.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_sample.res
+	c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res
 |

 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

-$(OBJS)\image_sample.res: .\..\..\samples\sample.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
-
 $(OBJS)\image_image.obj: .\image.cpp
 	$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp

 $(OBJS)\image_canvas.obj: .\canvas.cpp
 	$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp

+$(OBJS)\image_image.res: .\image.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc
--- a/samples/image/makefile.gcc
+++ b/samples/image/makefile.gcc
@@ -30,9 +30,9 @@ IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
-	$(OBJS)\image_sample_rc.o \
 	$(OBJS)\image_image.o \
-	$(OBJS)\image_canvas.o
+	$(OBJS)\image_canvas.o \
+	$(OBJS)\image_image_rc.o

 ### Conditionally set variables: ###

@@ -223,22 +223,22 @@ clean:
 	-if exist $(OBJS)\*.d del $(OBJS)\*.d
 	-if exist $(OBJS)\image.exe del $(OBJS)\image.exe

-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample_rc.o
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o
 	$(CXX) -o $@ $(IMAGE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet

 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %%f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)

-$(OBJS)\image_sample_rc.o: ./../../samples/sample.rc
-	windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
 $(OBJS)\image_image.o: ./image.cpp
 	$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<

 $(OBJS)\image_canvas.o: ./canvas.cpp
 	$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\image_image_rc.o: ./image.rc
+	windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
 .PHONY: all clean data


--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -34,7 +34,7 @@ IMAGE_OBJECTS =  \
 	$(OBJS)\image_image.obj \
 	$(OBJS)\image_canvas.obj
 IMAGE_RESOURCES =  \
-	$(OBJS)\image_sample.res
+	$(OBJS)\image_image.res

 ### Conditionally set variables: ###

@@ -356,7 +356,7 @@ clean:
 	-if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk
 	-if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb

-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample.res
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
 	$(IMAGE_OBJECTS) $(IMAGE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
 <<
@@ -365,12 +365,11 @@ data:
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

-$(OBJS)\image_sample.res: .\..\..\samples\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
-
 $(OBJS)\image_image.obj: .\image.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp

 $(OBJS)\image_canvas.obj: .\canvas.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp

+$(OBJS)\image_image.res: .\image.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc
--- a/samples/image/makefile.wat
+++ b/samples/image/makefile.wat
@@ -254,7 +254,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\image.exe del $(OBJS)\image.exe

-$(OBJS)\image.exe :  $(IMAGE_OBJECTS) $(OBJS)\image_sample.res
+$(OBJS)\image.exe :  $(IMAGE_OBJECTS) $(OBJS)\image_image.res
 	@%create $(OBJS)\image.lbc
 	@%append $(OBJS)\image.lbc option quiet
 	@%append $(OBJS)\image.lbc name $^@
@@ -262,7 +262,7 @@ $(OBJS)\image.exe :  $(IMAGE_OBJECTS) $(OBJS)\image_sample.res
 	@%append $(OBJS)\image.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
 	@for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i
 	@for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\image.lbc library %i
-	@%append $(OBJS)\image.lbc option resource=$(OBJS)\image_sample.res
+	@%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res
 	@for %i in () do @%append $(OBJS)\image.lbc option stack=%i
 	wlink @$(OBJS)\image.lbc

@@ -270,12 +270,11 @@ data : .SYMBOLIC
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

-$(OBJS)\image_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
-	wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
 $(OBJS)\image_image.obj :  .AUTODEPEND .\image.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<

 $(OBJS)\image_canvas.obj :  .AUTODEPEND .\canvas.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<

+$(OBJS)\image_image.res :  .AUTODEPEND .\image.rc
+	wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<