From 9ea83ebc7c595887e6f92b4972c866ff0e1437d6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 24 Jul 2010 11:49:05 +0000 Subject: [PATCH] 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 --- samples/image/Makefile.in | 2 +- samples/image/cursor.png | Bin 0 -> 489 bytes samples/image/image.bkl | 2 +- samples/image/image.cpp | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 samples/image/cursor.png 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 0000000000000000000000000000000000000000..32895dcb74b2bc64e0bd43f9b2e24420a8e0ce98 GIT binary patch literal 489 zcmV*?9nB>VXASM7X*8L1(GFvH%coQO*K)N6yo(3_TJ_}Ls?VqfJ z=F}bWaUcoQPB7F{PMA6^&50Nz0KmGnfPDl&LIl4Q!VJYO-2&3t_ zJ^y;ybH*{ooUtrRzP3SJcA@}~_1_gPuU&>H<^TZ{{L<9CCtN(};!TtwI_uUfQp3nn zNH_Kz&>+;^5I{r99g;1VTXgVCc4j1AB%8|71=s_UAPvO9FxK@QI0`e`8}_=Wv98~W zhc~9VLI8D}6E=7DT)Etc7(_dG+`6?~CE7C{dDTrJU+roqcoKf)z+SK$BPSkpKt{ca f@@K$X0KNDJYPlX{nI0c(00000NkvXXu0mjfVBg3~ literal 0 HcmV?d00001 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 @@ 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 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) ) -- 2.47.2