From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Jul 2010 11:49:05 +0000 (+0000)
Subject: Add test for a custom cursor to the image sample.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9ea83ebc7c595887e6f92b4972c866ff0e1437d6?ds=inline

Add test for a custom cursor to the image sample.

Load a cursor from PNG file to check that it appears as expected.

See #11989.

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

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index e11a0489b1..9c499840ad 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -177,7 +177,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
 
 data: 
 	@mkdir -p .
-	@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; do \
+	@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 test ! -f ./$$f -a ! -d ./$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
diff --git a/samples/image/cursor.png b/samples/image/cursor.png
new file mode 100644
index 0000000000..32895dcb74
Binary files /dev/null and b/samples/image/cursor.png differ
diff --git a/samples/image/image.bkl b/samples/image/image.bkl
index 3762421268..3c6268b079 100644
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -16,7 +16,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>
 
diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index d265524368..826cad7686 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -678,6 +678,7 @@ MyFrame::MyFrame()
 
     // 500 width * 2750 height
     m_canvas->SetScrollbars( 10, 10, 50, 275 );
+    m_canvas->SetCursor(wxImage("cursor.png"));
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )