Added new image for dnd sample

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

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 12695f6fa96fd4ee2863cfe873b6b413c4374222..7033af1c7ce497c54bb85c9f66ddc1250168682e 100644 (file)
--- 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 534364ddc8932c284933d1db856f158e0fc3eb41..406de44049b525e19664b4981124a97953529edd 100644 (file)
--- 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 7abe4495ebee24ebc01e2e1a1e6d735a74305f44..8388623e65ed08ac88f0d0da55a1b05015f7bccb 100644 (file)
--- 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 1bcde5ad0718e468508b20c66453faf1a647633c..ea82d559d6f473d47b0b7e71b792a669e66e384a 100644 (file)
--- 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 96aee10d3ce1d6fea23ece58800dcf9df53f0c81..85bfa236dea93dd4076ef67defbb2ec030879ec6 100644 (file)
--- 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 7c518209b3e415592a1cdab5a2a682fa56caa700..67fe60c19141680b31146d32438d88c31e4709ed 100644 (file)
--- 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 a10c30d71a8a9051c70ae1b48cb0963db3f3b91f..80193da60740e543fe3524c52b82b1e0bb2c2dff 100644 (file)
--- 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 (file)
index 0000000..f4b9a7e
Binary files /dev/null and b/samples/dnd/wxwin.png differ