X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b05d97389caaaa487f8b142204aa0c533e41e92..8480b297e70a29b785421ded6db22ae024e35038:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 335f548f83..7d869ced3e 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -23,6 +23,7 @@ #include "wx/file.h" #include "smile.xbm" +#include "smile.xpm" // derived classes @@ -51,6 +52,10 @@ public: wxBitmap *my_square; wxBitmap *my_anti; +protected: + wxBitmap m_bmpSmileXpm; + wxIcon m_iconSmileXpm; + private: DECLARE_DYNAMIC_CLASS(MyCanvas) DECLARE_EVENT_TABLE() @@ -95,7 +100,8 @@ END_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ) + : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ), + m_bmpSmileXpm(smile_xpm), m_iconSmileXpm(smile_xpm) { my_horse_png = (wxBitmap*) NULL; my_horse_jpeg = (wxBitmap*) NULL; @@ -115,8 +121,10 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxMemoryDC dc; dc.SelectObject( bitmap ); dc.SetBrush( wxBrush( "orange", wxSOLID ) ); - dc.SetPen( *wxWHITE_PEN ); + dc.SetPen( *wxBLACK_PEN ); dc.DrawRectangle( 0, 0, 100, 100 ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( 20, 20, 60, 60 ); dc.SelectObject( wxNullBitmap ); // try to find the directory with our images @@ -130,6 +138,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxImage image( bitmap ); +#if wxUSE_LIBPNG if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) ) wxLogError("Can't save file"); @@ -137,11 +146,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, 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") ) ) 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") ) ) @@ -209,15 +221,17 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawText( "Drawn directly", 150, 10 ); dc.SetBrush( wxBrush( "orange", wxSOLID ) ); - dc.SetPen( *wxWHITE_PEN ); + dc.SetPen( *wxBLACK_PEN ); dc.DrawRectangle( 150, 30, 100, 100 ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( 170, 50, 60, 60 ); - if (my_anti && my_anti->Ok()) + if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 280, 30 ); dc.DrawText( "PNG handler", 30, 135 ); if (my_horse_png && my_horse_png->Ok()) - { + { dc.DrawBitmap( *my_horse_png, 30, 150 ); wxRect rect(0,0,100,100); wxBitmap sub( my_horse_png->GetSubBitmap(rect) ); @@ -226,71 +240,90 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) } dc.DrawText( "JPEG handler", 30, 365 ); - if (my_horse_jpeg && my_horse_jpeg->Ok()) + if (my_horse_jpeg && my_horse_jpeg->Ok()) dc.DrawBitmap( *my_horse_jpeg, 30, 380 ); dc.DrawText( "GIF handler", 30, 595 ); - if (my_horse_gif && my_horse_gif->Ok()) + if (my_horse_gif && my_horse_gif->Ok()) dc.DrawBitmap( *my_horse_gif, 30, 610 ); dc.DrawText( "PCX handler", 30, 825 ); - if (my_horse_pcx && my_horse_pcx->Ok()) + if (my_horse_pcx && my_horse_pcx->Ok()) dc.DrawBitmap( *my_horse_pcx, 30, 840 ); dc.DrawText( "BMP handler", 30, 1055 ); - if (my_horse_bmp && my_horse_bmp->Ok()) + if (my_horse_bmp && my_horse_bmp->Ok()) dc.DrawBitmap( *my_horse_bmp, 30, 1070 ); dc.DrawText( "PNM handler", 30, 1285 ); - if (my_horse_pnm && my_horse_pnm->Ok()) + if (my_horse_pnm && my_horse_pnm->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 ); - + dc.DrawText( "TIFF handler", 30, 1515 ); - if (my_horse_tiff && my_horse_tiff->Ok()) + if (my_horse_tiff && my_horse_tiff->Ok()) dc.DrawBitmap( *my_horse_tiff, 30, 1530 ); - if (my_smile_xbm && my_smile_xbm->Ok()) + 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( "After wxImage conversion", 150, 1745 ); wxImage i( *my_smile_xbm ); - i.SetMaskColour( 0,0,0 ); - i.Replace( 255,255,255, + i.SetMaskColour( 0,0,0 ); + i.Replace( 255,255,255, wxRED_PEN->GetColour().Red(), wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Blue() ); dc.DrawBitmap( i.ConvertToBitmap(), 150, 1760, TRUE ); } dc.SetTextForeground( "BLACK" ); - - wxBitmap mono( 30,30,1 ); + + wxBitmap mono( 60,50,1 ); wxMemoryDC memdc; memdc.SelectObject( mono ); memdc.SetPen( *wxTRANSPARENT_PEN ); - memdc.SetBrush( *wxBLACK_BRUSH ); - memdc.DrawRectangle( 0,0,30,30 ); memdc.SetBrush( *wxWHITE_BRUSH ); - memdc.DrawRectangle( 5,5,20,20 ); + memdc.DrawRectangle( 0,0,60,50 ); + memdc.SetTextForeground( *wxBLACK ); + memdc.DrawText( "Hi!", 5, 5 ); + memdc.SetBrush( *wxBLACK_BRUSH ); + memdc.DrawRectangle( 33,5,20,20 ); + memdc.SetPen( *wxRED_PEN ); + memdc.DrawLine( 5, 42, 50, 42 ); memdc.SelectObject( wxNullBitmap ); - if (mono.Ok()) + if (mono.Ok()) { dc.DrawText( "Mono bitmap", 30, 1845 ); dc.SetTextForeground( "RED" ); dc.SetTextBackground( "GREEN" ); dc.DrawBitmap( mono, 30, 1860 ); - + + dc.SetTextForeground( "BLACK" ); dc.DrawText( "After wxImage conversion", 150, 1845 ); + dc.SetTextForeground( "RED" ); wxImage i( mono ); - 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, 1860, TRUE ); + dc.SetTextForeground( "BLACK" ); + } + + dc.DrawText("XPM bitmap", 30, 1950); + if ( m_bmpSmileXpm.Ok() ) + { + dc.DrawBitmap(m_bmpSmileXpm, 30, 1975, TRUE); + } + + dc.DrawText("XPM icon", 150, 1950); + if ( m_iconSmileXpm.Ok() ) + { + dc.DrawIcon(m_iconSmileXpm, 150, 1975); } } @@ -374,8 +407,8 @@ MyFrame::MyFrame() m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); - // 500 width * 1900 height - m_canvas->SetScrollbars( 10, 10, 50, 200 ); + // 500 width * 2100 height + m_canvas->SetScrollbars( 10, 10, 50, 210 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) @@ -386,8 +419,7 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { (void)wxMessageBox( "wxImage demo\n" - "\n" - "Robert Roebling (c) 1998", + "Robert Roebling (c) 1998,2000", "About wxImage Demo", wxICON_INFORMATION | wxOK ); }