From 1c9c480e80847ef92a63c3403497f090eb91152e Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 11 Sep 2003 19:25:50 +0000
Subject: [PATCH] Added new image for dnd sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/dnd/Makefile.in  |   2 +-
 samples/dnd/dnd.bkl      |   2 +-
 samples/dnd/dnd.cpp      |   6 +++---
 samples/dnd/makefile.bcc |   2 +-
 samples/dnd/makefile.gcc |   2 +-
 samples/dnd/makefile.vc  |   2 +-
 samples/dnd/makefile.wat |   2 +-
 samples/dnd/wxwin.png    | Bin 0 -> 1119 bytes
 8 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 samples/dnd/wxwin.png

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 12695f6fa9..7033af1c7c 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -106,7 +106,7 @@ clean:
 
 data: 
 	@mkdir -p .
-	@for f in dnd.wxr; do \
+	@for f in wxwin.png dnd.wxr; do \
 	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
 	cp -pRf $(srcdir)/$$f . ; \
 	fi; \
diff --git a/samples/dnd/dnd.bkl b/samples/dnd/dnd.bkl
index 534364ddc8..406de44049 100644
--- a/samples/dnd/dnd.bkl
+++ b/samples/dnd/dnd.bkl
@@ -11,7 +11,7 @@
     </exe>
 
     <wx-data id="data">
-        <files>dnd.wxr</files>
+        <files>wxwin.png dnd.wxr</files>
     </wx-data>
 
 </makefile>
diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 7abe4495eb..8388623e65 100644
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -1216,10 +1216,10 @@ void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
 
     wxImage image;
     image.LoadFile( dialog.GetPath(),
-#ifdef __WXMSW__
-                    wxBITMAP_TYPE_BMP
-#else
+#if wxUSE_LIBPNG
                     wxBITMAP_TYPE_PNG
+#else
+                    wxBITMAP_TYPE_BMP
 #endif
                   );
     if (!image.Ok())
diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc
index 1bcde5ad07..ea82d559d6 100644
--- a/samples/dnd/makefile.bcc
+++ b/samples/dnd/makefile.bcc
@@ -166,7 +166,7 @@ clean:
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\dnd.exe: $(DND_OBJECTS)  $(OBJS)\dnd_dnd.res
 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc
index 96aee10d3c..85bfa236de 100644
--- a/samples/dnd/makefile.gcc
+++ b/samples/dnd/makefile.gcc
@@ -159,7 +159,7 @@ clean:
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %%f in (dnd.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+	for %%f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o
 	$(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc
index 7c518209b3..67fe60c191 100644
--- a/samples/dnd/makefile.vc
+++ b/samples/dnd/makefile.vc
@@ -229,7 +229,7 @@ clean:
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat
index a10c30d71a..80193da607 100644
--- a/samples/dnd/makefile.wat
+++ b/samples/dnd/makefile.wat
@@ -195,7 +195,7 @@ clean : .SYMBOLIC
 
 data : .SYMBOLIC 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\dnd.exe :  $(DND_OBJECTS) $(OBJS)\dnd_dnd.res
 	@%create $(OBJS)\dnd.lbc
diff --git a/samples/dnd/wxwin.png b/samples/dnd/wxwin.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4b9a7e378b78abb184a6592951d0a80d9ef93de
GIT binary patch
literal 1119
zcmbVKk5AlG9IujPH-5y1f$OGm)`;WDjMhb59q2fZ+-TfE8Zx#<7nT#xr2)oz<d#(3
zIqMRZ8VS|~X2+1M8YJhkjOq?j!$DTrK^g{2hp^Ron^s}VkulR4nf2Wz{sVsV`F=j1
z@8`X|<h{I(x`4kRcT+BcAO$tMd^FT8upjf}K%Tht&J`%d;p)BN*AF)x2p?>1d9was
za}%<5c3oc4di=nT-BobI+HlS8>TFc}Y<pnMYcN`OXxBatLGlVS{m{&f4^|N*2dR6b
zz8Wq@vmMP!6i(6TD6H$FUnQ3jKqG)bNe&}90x*DJagqZhM-oBA%cB&Jd3lWDaf%0!
zX^y1%2u@N2!;}PqfaZbM;}uW{3PQvv0fS5n7%k$IfYT5n&WL~(04)LrdI>NR!H6U+
zkc>#cF(?s1iOfJIS*enhz57LPNTOJYYL#hLqB+^iDHNyBoYK(V&+tl+lS7eimY0LP
z!tx5o_w9`i289?aC@f?#78F%hR5>wrv@^zas+^?plFG{vn&iO*6bLve;XuNPv-yu|
z2%;e#&6BU@7ip+R#W1Z1Q!re?Kn%rW7*H`>!*CS`8jfp_0Z>bb@3y|IzU0#?{HmAM
zXhv&j(h)@WcytuiF-*rxbO3ZfB%j}A5ah&;$~20kQBN92$En&$uiv03eb4^sT6*@a
z#zd%fyqPyzBQqh^WVsaA=DMyC5$2A5<feh^Kyb&8OM;{dGK3~dswk_HtcrbFPycYd
z<7CIzdiUUX?}e#>fkfZ=#GpELA)eIY`uWkTYSPlhZc~)zPoA=R&X{t{RAQE*nCCA3
z*3q%}dDkE6_bc&{>5=69g?`r&5(#5`!qg4RNSc$gmYFo?rY+sH4bz@our14;v+h_{
z+Ok)cE*nn9rS9CEw^O#APA}O@X((w(P8z~-oRsZk2iLaUY~*HR$8jBa$^Qge_(T79
zxqmPB^_`7IqnT4&BzqX7jDvM=WM~=YS89A!^+)E_&#H3AUO=lydV7r>N4lmSANBT^
zeHp1cQF$zUD^Rnu;>7xQXP<tisr;WIX>4*b+*N*h>+aQun<uXwZXoAMK77U5etCP@
zZA%lm&@aR8N>$f4kAw>wTTU1Mwex3P%JJ3T_NTVBytpxPvGo3->!Im0ygra9T<A<a
zSaY{G{%QQD4Q+a$#K?2nwk*EtbGt|Kh8J%o-o9D>-Vasnn+wie@~;w4ZJycl{$OqF
z&rkf%-TT#!I(IjPhpt|GAeS|k{ysMRv0L%QK4ZfZJ+{^Cd9yV0ZZ*{b-?!ezWB&qX
Cu?m0y

literal 0
HcmV?d00001

-- 
2.45.2