From 4fea5f26d46f7ee211f34908d82828133caaedb6 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 19 May 2005 10:15:53 +0000
Subject: [PATCH] Replaced image

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in                  |   2 +-
 build/bakefiles/make_dist.mk |   2 +-
 samples/rotate/Makefile.in   |   2 +-
 samples/rotate/duck.png      | Bin 0 -> 7754 bytes
 samples/rotate/kclub.bmp     | Bin 12118 -> 0 bytes
 samples/rotate/makefile.bcc  |   2 +-
 samples/rotate/makefile.gcc  |   2 +-
 samples/rotate/makefile.vc   |   2 +-
 samples/rotate/makefile.wat  |   2 +-
 samples/rotate/rotate.bkl    |   2 +-
 samples/rotate/rotate.cpp    |  52 ++++++++++++++++++-----------------
 11 files changed, 35 insertions(+), 33 deletions(-)
 create mode 100644 samples/rotate/duck.png
 delete mode 100644 samples/rotate/kclub.bmp

diff --git a/Makefile.in b/Makefile.in
index 13fdb61e95..9d9bc2492b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24852,7 +24852,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
-	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate
 
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 37abcff7cc..8874b1d101 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -781,7 +781,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
-	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate
 
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in
index 4c40493b4f..7cd2117ac3 100644
--- a/samples/rotate/Makefile.in
+++ b/samples/rotate/Makefile.in
@@ -174,7 +174,7 @@ rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
 
 data: 
 	@mkdir -p .
-	@for f in kclub.bmp; do \
+	@for f in duck.png; do \
 	if test ! -f ./$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
diff --git a/samples/rotate/duck.png b/samples/rotate/duck.png
new file mode 100644
index 0000000000000000000000000000000000000000..19721266e9574051a5f9ccf9672906a3001538fb
GIT binary patch
literal 7754
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

literal 0
HcmV?d00001

diff --git a/samples/rotate/kclub.bmp b/samples/rotate/kclub.bmp
deleted file mode 100644
index 2a4aa03a4bab0bc5fd723b28a0dd39d9f01af7f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12118
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

diff --git a/samples/rotate/makefile.bcc b/samples/rotate/makefile.bcc
index 30f539035a..12c027d56f 100644
--- a/samples/rotate/makefile.bcc
+++ b/samples/rotate/makefile.bcc
@@ -212,7 +212,7 @@ $(OBJS)\rotate.exe: $(ROTATE_OBJECTS)  $(OBJS)\rotate_rotate.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (kclub.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (duck.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\rotate_rotate.obj: .\rotate.cpp
 	$(CXX) -q -c -P -o$@ $(ROTATE_CXXFLAGS) $**
diff --git a/samples/rotate/makefile.gcc b/samples/rotate/makefile.gcc
index 33c70f9bbf..a573d07d4f 100644
--- a/samples/rotate/makefile.gcc
+++ b/samples/rotate/makefile.gcc
@@ -203,7 +203,7 @@ $(OBJS)\rotate.exe: $(ROTATE_OBJECTS) $(OBJS)\rotate_rotate_rc.o
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %%f in (kclub.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+	for %%f in (duck.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\rotate_rotate.o: ./rotate.cpp
 	$(CXX) -c -o $@ $(ROTATE_CXXFLAGS) $<
diff --git a/samples/rotate/makefile.vc b/samples/rotate/makefile.vc
index 9544ac17d2..85d38a5130 100644
--- a/samples/rotate/makefile.vc
+++ b/samples/rotate/makefile.vc
@@ -263,7 +263,7 @@ $(OBJS)\rotate.exe: $(ROTATE_OBJECTS) $(OBJS)\rotate_rotate.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (kclub.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (duck.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\rotate_rotate.obj: .\rotate.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ROTATE_CXXFLAGS) $**
diff --git a/samples/rotate/makefile.wat b/samples/rotate/makefile.wat
index 3a083010c4..58830dafb0 100644
--- a/samples/rotate/makefile.wat
+++ b/samples/rotate/makefile.wat
@@ -246,7 +246,7 @@ $(OBJS)\rotate.exe :  $(ROTATE_OBJECTS) $(OBJS)\rotate_rotate.res
 
 data : .SYMBOLIC 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (kclub.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (duck.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\rotate_rotate.obj :  .AUTODEPEND .\rotate.cpp
 	$(CXX) -zq -fo=$^@ $(ROTATE_CXXFLAGS) $<
diff --git a/samples/rotate/rotate.bkl b/samples/rotate/rotate.bkl
index 7c9eff1038..e212f20e41 100644
--- a/samples/rotate/rotate.bkl
+++ b/samples/rotate/rotate.bkl
@@ -12,7 +12,7 @@
     
     <wx-data id="data">
         <files>
-            kclub.bmp
+            duck.png
         </files>
     </wx-data>
 
diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 002cc3bebd..7313f50ec8 100644
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -47,20 +47,20 @@ private:
 };
 
 // ----------------------------------------------------------------------------
-// data class for cards that need to be rendered
+// data class for images that need to be rendered
 // ----------------------------------------------------------------------------
 
-class MyRenderedCard
+class MyRenderedImage
 {
 public:
-    MyRenderedCard(const wxBitmap& bmp, int x, int y)
+    MyRenderedImage(const wxBitmap& bmp, int x, int y)
         : m_bmp(bmp), m_x(x), m_y(y) { }
     wxBitmap m_bmp;
     int m_x, m_y;
 };
 
-// Declare a wxArray type to hold MyRenderedCards.
-WX_DECLARE_OBJARRAY(MyRenderedCard, ArrayOfCards);
+// Declare a wxArray type to hold MyRenderedImages.
+WX_DECLARE_OBJARRAY(MyRenderedImage, ArrayOfImages);
 
 // ----------------------------------------------------------------------------
 // custom canvas control that we can draw on
@@ -71,14 +71,14 @@ class MyCanvas: public wxScrolledWindow
 public:
     MyCanvas(wxWindow* parent);
 
-    void ClearCards();
+    void ClearImages();
 
     void OnMouseLeftUp (wxMouseEvent & event);
     void OnMouseRightUp (wxMouseEvent & event);
     void OnPaint (wxPaintEvent & event);
 
 private:
-    ArrayOfCards m_cards;
+    ArrayOfImages m_images;
 
     DECLARE_EVENT_TABLE()
 };
@@ -127,10 +127,11 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
-    m_image = wxImage(_T("kclub.bmp"), wxBITMAP_TYPE_BMP);
+#if wxUSE_LIBPNG
+    wxImage::AddHandler( new wxPNGHandler );
+#endif
 
-    // any unused colour will do
-    m_image.SetMaskColour( 0, 255, 255 );
+    m_image = wxImage(_T("duck.png"), wxBITMAP_TYPE_PNG);
 
     if ( !m_image.Ok() )
     {
@@ -148,11 +149,11 @@ bool MyApp::OnInit()
 }
 
 // ----------------------------------------------------------------------------
-// data class for cards that need to be rendered
+// data class for images that need to be rendered
 // ----------------------------------------------------------------------------
 
 #include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(ArrayOfCards);
+WX_DEFINE_OBJARRAY(ArrayOfImages);
 
 // ----------------------------------------------------------------------------
 // custom canvas control that we can draw on
@@ -171,9 +172,9 @@ MyCanvas::MyCanvas(wxWindow* parent):
     ClearBackground();
 }
 
-void MyCanvas::ClearCards ()
+void MyCanvas::ClearImages ()
 {
-    m_cards.Clear();
+    m_images.Clear();
     Refresh(true);
 }
 
@@ -187,8 +188,8 @@ void MyCanvas::OnMouseLeftUp (wxMouseEvent & event)
     wxImage img2 = img.Rotate(frame->m_angle,
         wxPoint(img.GetWidth() / 2, img.GetHeight() / 2), true, &offset);
 
-    // Add the cards to an array to be drawn later in OnPaint()
-    m_cards.Add(new MyRenderedCard(wxBitmap(img2),
+    // Add the images to an array to be drawn later in OnPaint()
+    m_images.Add(new MyRenderedImage(wxBitmap(img2),
         event.m_x + offset.x, event.m_y + offset.y));
     Refresh(false);
 }
@@ -202,24 +203,24 @@ void MyCanvas::OnMouseRightUp (wxMouseEvent & event)
     wxImage img2 = img.Rotate(frame->m_angle,
         wxPoint(img.GetWidth() / 2, img.GetHeight() / 2), false);
 
-    // Add the cards to an array to be drawn later in OnPaint()
-    m_cards.Add(new MyRenderedCard(wxBitmap(img2), event.m_x, event.m_y));
+    // Add the images to an array to be drawn later in OnPaint()
+    m_images.Add(new MyRenderedImage(wxBitmap(img2), event.m_x, event.m_y));
     Refresh(false);
 }
 
 void MyCanvas::OnPaint (wxPaintEvent &)
 {
-    size_t numCards = m_cards.GetCount();
+    size_t numImages = m_images.GetCount();
 
     wxPaintDC dc(this);
     dc.BeginDrawing();
 
     dc.SetTextForeground(wxColour(255, 255, 255));
-    dc.DrawText(wxT("Click on the canvas to draw a card."), 10, 10);
+    dc.DrawText(wxT("Click on the canvas to draw a duck."), 10, 10);
 
-    for (size_t i = 0; i < numCards; i++) {
-        MyRenderedCard & card = m_cards.Item(i);
-        dc.DrawBitmap(card.m_bmp, card.m_x, card.m_y, true);
+    for (size_t i = 0; i < numImages; i++) {
+        MyRenderedImage & image = m_images.Item(i);
+        dc.DrawBitmap(image.m_bmp, image.m_x, image.m_y, true);
     }
 
     dc.EndDrawing();
@@ -244,7 +245,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     wxMenu *menuFile = new wxMenu;
     menuFile->Append (ID_Angle, _T("Set &angle...\tCtrl-A"));
-    menuFile->Append (ID_Clear, _T("&Clear all cards\tCtrl-C"));
+    menuFile->Append (ID_Clear, _T("&Clear all ducks\tCtrl-C"));
     menuFile->AppendSeparator();
     menuFile->Append (ID_Quit, _T("E&xit\tAlt-X"));
 
@@ -274,5 +275,6 @@ void MyFrame::OnQuit (wxCommandEvent &)
 
 void MyFrame::OnClear (wxCommandEvent &)
 {
-    m_canvas->ClearCards ();
+    m_canvas->ClearImages ();
 }
+
-- 
2.45.2