X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bea5687993481b6ba9c0627a0440aca38d1b3842..94799627ee0ad217b2fc41df5bd5bccf59494e00:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 7d869ced3e..3db24946fa 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -19,7 +19,6 @@ #endif #include "wx/image.h" - #include "wx/file.h" #include "smile.xbm" @@ -100,8 +99,11 @@ END_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ), - m_bmpSmileXpm(smile_xpm), m_iconSmileXpm(smile_xpm) + : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ) +#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW + , m_bmpSmileXpm((const char **) smile_xpm) + , m_iconSmileXpm((const char **) smile_xpm) +#endif { my_horse_png = (wxBitmap*) NULL; my_horse_jpeg = (wxBitmap*) NULL; @@ -139,42 +141,59 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxImage image( bitmap ); #if wxUSE_LIBPNG - if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) ) + if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG )) wxLogError("Can't save file"); + + image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) ) + image.LoadFile( dir + wxString("test.png") ); + my_square = new wxBitmap( image.ConvertToBitmap() ); + + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.png")) ) wxLogError("Can't load PNG image"); else my_horse_png = new wxBitmap( image.ConvertToBitmap() ); #endif // wxUSE_LIBPNG #if wxUSE_LIBJPEG - if ( !image.LoadFile( dir + wxString("horse.jpg") ) ) + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.jpg")) ) wxLogError("Can't load JPG image"); else my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() ); #endif // wxUSE_LIBJPEG #if wxUSE_GIF - if ( !image.LoadFile( dir + wxString("horse.gif") ) ) + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.gif")) ) wxLogError("Can't load GIF image"); else my_horse_gif = new wxBitmap( image.ConvertToBitmap() ); #endif #if wxUSE_PCX + image.Destroy(); + if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) ) wxLogError("Can't load PCX image"); else my_horse_pcx = new wxBitmap( image.ConvertToBitmap() ); #endif + image.Destroy(); + if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) ) wxLogError("Can't load BMP image"); else my_horse_bmp = new wxBitmap( image.ConvertToBitmap() ); #if wxUSE_PNM + image.Destroy(); + if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) ) wxLogError("Can't load PNM image"); else @@ -182,19 +201,26 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #endif #if wxUSE_LIBTIFF + image.Destroy(); + if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) ) wxLogError("Can't load TIFF image"); else my_horse_tiff = new wxBitmap( image.ConvertToBitmap() ); #endif - image.LoadFile( dir + wxString("test.png") ); - my_square = new wxBitmap( image.ConvertToBitmap() ); - CreateAntiAliasedBitmap(); 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() @@ -266,25 +292,30 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (my_smile_xbm && my_smile_xbm->Ok()) { dc.DrawText( "XBM bitmap", 30, 1745 ); - dc.SetTextForeground( "RED" ); - dc.SetTextBackground( "GREEN" ); - dc.DrawBitmap( *my_smile_xbm, 30, 1760 ); + dc.DrawText( "(green on red)", 30, 1760 ); + dc.SetTextForeground( "GREEN" ); + dc.SetTextBackground( "RED" ); + dc.DrawBitmap( *my_smile_xbm, 30, 1780 ); + dc.SetTextForeground( "BLACK" ); dc.DrawText( "After wxImage conversion", 150, 1745 ); + dc.DrawText( "(red on white)", 150, 1760 ); + dc.SetTextForeground( "RED" ); wxImage i( *my_smile_xbm ); - i.SetMaskColour( 0,0,0 ); - i.Replace( 255,255,255, + i.SetMaskColour( 255, 255, 255 ); + i.Replace( 0, 0, 0, wxRED_PEN->GetColour().Red(), wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( i.ConvertToBitmap(), 150, 1760, TRUE ); + dc.DrawBitmap( i.ConvertToBitmap(), 150, 1780, TRUE ); + dc.SetTextForeground( "BLACK" ); } - dc.SetTextForeground( "BLACK" ); + wxBitmap mono( 60,50,1 ); wxMemoryDC memdc; memdc.SelectObject( mono ); - memdc.SetPen( *wxTRANSPARENT_PEN ); + memdc.SetPen( *wxBLACK_PEN ); memdc.SetBrush( *wxWHITE_BRUSH ); memdc.DrawRectangle( 0,0,60,50 ); memdc.SetTextForeground( *wxBLACK ); @@ -294,15 +325,18 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) memdc.SetPen( *wxRED_PEN ); memdc.DrawLine( 5, 42, 50, 42 ); memdc.SelectObject( wxNullBitmap ); + if (mono.Ok()) { - dc.DrawText( "Mono bitmap", 30, 1845 ); + dc.DrawText( "Mono bitmap", 30, 1865 ); + dc.DrawText( "(red on green)", 30, 1880 ); dc.SetTextForeground( "RED" ); dc.SetTextBackground( "GREEN" ); - dc.DrawBitmap( mono, 30, 1860 ); + dc.DrawBitmap( mono, 30, 1900 ); dc.SetTextForeground( "BLACK" ); - dc.DrawText( "After wxImage conversion", 150, 1845 ); + dc.DrawText( "After wxImage conversion", 150, 1865 ); + dc.DrawText( "(red on white)", 150, 1880 ); dc.SetTextForeground( "RED" ); wxImage i( mono ); i.SetMaskColour( 255,255,255 ); @@ -310,20 +344,20 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxRED_PEN->GetColour().Red(), wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( i.ConvertToBitmap(), 150, 1860, TRUE ); + dc.DrawBitmap( i.ConvertToBitmap(), 150, 1900, TRUE ); dc.SetTextForeground( "BLACK" ); } - dc.DrawText("XPM bitmap", 30, 1950); + dc.DrawText("XPM bitmap", 30, 2000); if ( m_bmpSmileXpm.Ok() ) { - dc.DrawBitmap(m_bmpSmileXpm, 30, 1975, TRUE); + dc.DrawBitmap(m_bmpSmileXpm, 30, 2020, TRUE); } - dc.DrawText("XPM icon", 150, 1950); + dc.DrawText("XPM icon", 150, 2000); if ( m_iconSmileXpm.Ok() ) { - dc.DrawIcon(m_iconSmileXpm, 150, 1975); + dc.DrawIcon(m_iconSmileXpm, 150, 2020); } } @@ -393,7 +427,7 @@ MyFrame::MyFrame() wxPoint(20,20), wxSize(470,360) ) { wxMenu *file_menu = new wxMenu(); - file_menu->Append( ID_ABOUT, "&About.."); + file_menu->Append( ID_ABOUT, "&About..."); file_menu->Append( ID_QUIT, "E&xit"); wxMenuBar *menu_bar = new wxMenuBar(); @@ -408,7 +442,7 @@ MyFrame::MyFrame() m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); // 500 width * 2100 height - m_canvas->SetScrollbars( 10, 10, 50, 210 ); + m_canvas->SetScrollbars( 10, 10, 50, 220 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )