Don't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.

[wxWidgets.git] / samples / image / image.bkl

diff --git a/samples/image/image.bkl b/samples/image/image.bkl
index be89e4d6e13671a640f2b87ee0c42986560b37b4..3f441f74c39aec0958bb1e44df36cfdd61d41500 100644 (file)
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -3,10 +3,17 @@
 
 <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">
-        <sources>image.cpp</sources>
+        <sources>image.cpp canvas.cpp</sources>
+        <headers>canvas.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>image.rc</win32-res>
@@ -16,7 +23,7 @@
         <files>
             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
+            smile.xbm toucan.png cmyk.jpg cursor.png
         </files>
     </wx-data>