From a8d4e3ac60fc8cda5e080992b7fa382162993d74 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 22 Apr 2001 22:25:18 +0000
Subject: [PATCH] added test for XPM writing; ConvertToBitmap, ConvertToImage
 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/image/image.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 55b68053ff..88a08a91ae 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -20,10 +20,13 @@
 
 #include "wx/image.h"
 #include "wx/file.h"
+#include "wx/mstream.h"
+#include "wx/wfstream.h"
 
 #include "smile.xbm"
 #include "smile.xpm"
 
+
 // derived classes
 
 class MyFrame;
@@ -167,7 +170,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     else
         wxLogWarning("Can't find image files in either '.' or '..'!");
 
-    wxImage image( bitmap );
+    wxImage image = bitmap.ConvertToImage();
 
 #if wxUSE_LIBPNG
     if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ))
@@ -176,14 +179,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     image.Destroy();
 
     image.LoadFile( dir + wxString("test.png") );
-    my_square = new wxBitmap( image.ConvertToBitmap() );
+    my_square = new wxBitmap( image );
 
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.png")) )
         wxLogError("Can't load PNG image");
     else
-        my_horse_png = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_png = new wxBitmap( image );
 #endif // wxUSE_LIBPNG
 
 #if wxUSE_LIBJPEG
@@ -220,6 +223,11 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     else
         my_horse_bmp = new wxBitmap( image.ConvertToBitmap() );
 
+#if wxUSE_XPM
+    if ( !image.SaveFile( dir + wxString("test.xpm"), wxBITMAP_TYPE_XPM ))
+        wxLogError("Can't save file");
+#endif
+
 #if wxUSE_PNM
     image.Destroy();
 
@@ -243,13 +251,11 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
                                  smile_height, 1 );
 
-#ifndef __WXGTK__
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     // demonstrates XPM automatically using the mask when saving
     if ( m_bmpSmileXpm.Ok() )
         m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
 #endif
-#endif
 }
 
 MyCanvas::~MyCanvas()
@@ -330,7 +336,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.DrawText( "After wxImage conversion", 150, 1745 );
         dc.DrawText( "(red on white)", 150, 1760 );
         dc.SetTextForeground( "RED" );
-        wxImage i( *my_smile_xbm );
+        wxImage i = my_smile_xbm->ConvertToImage();
         i.SetMaskColour( 255, 255, 255 );
         i.Replace( 0, 0, 0,
                wxRED_PEN->GetColour().Red(),
@@ -367,7 +373,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.DrawText( "After wxImage conversion", 150, 1865 );
         dc.DrawText( "(red on white)", 150, 1880 );
         dc.SetTextForeground( "RED" );
-        wxImage i( mono );
+        wxImage i = mono.ConvertToImage();
         i.SetMaskColour( 255,255,255 );
         i.Replace( 0,0,0,
                wxRED_PEN->GetColour().Red(),
@@ -409,7 +415,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
   dc.SetPen( *wxTRANSPARENT_PEN );
   dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
 
-  wxImage original( bitmap );
+  wxImage original= bitmap.ConvertToImage();
   wxImage anti( 150, 150 );
 
   /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
@@ -538,6 +544,10 @@ bool MyApp::OnInit()
   wxImage::AddHandler( new wxPNMHandler );
 #endif
 
+#if wxUSE_XPM
+  wxImage::AddHandler( new wxXPMHandler );
+#endif
+
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );
 
-- 
2.45.2