X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/408b4168c84f8af6931010e1fb5c7b7aebed43e6..015e69f36dfbc469eef59456f973d0567e865d70:/samples/image/image.cpp?ds=sidebyside diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 0684031d57..55b68053ff 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -19,10 +19,10 @@ #endif #include "wx/image.h" - #include "wx/file.h" #include "smile.xbm" +#include "smile.xpm" // derived classes @@ -51,6 +51,10 @@ public: wxBitmap *my_square; wxBitmap *my_anti; +protected: + wxBitmap m_bmpSmileXpm; + wxIcon m_iconSmileXpm; + private: DECLARE_DYNAMIC_CLASS(MyCanvas) DECLARE_EVENT_TABLE() @@ -64,6 +68,7 @@ public: MyFrame(); void OnAbout( wxCommandEvent &event ); + void OnNewFrame( wxCommandEvent &event ); void OnQuit( wxCommandEvent &event ); MyCanvas *m_canvas; @@ -73,6 +78,30 @@ private: DECLARE_EVENT_TABLE() }; +class MyImageFrame : public wxFrame +{ +public: + MyImageFrame(wxFrame *parent, const wxBitmap& bitmap) + : wxFrame(parent, -1, _T("Frame with image"), + wxDefaultPosition, wxDefaultSize, + wxCAPTION | wxSYSTEM_MENU), + m_bitmap(bitmap) + { + SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); + } + + void OnPaint(wxPaintEvent& WXUNUSED(event)) + { + wxPaintDC dc( this ); + dc.DrawBitmap( m_bitmap, 0, 0 ); + } + +private: + wxBitmap m_bitmap; + + DECLARE_EVENT_TABLE() +}; + // MyApp class MyApp: public wxApp @@ -89,6 +118,10 @@ IMPLEMENT_APP(MyApp) IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow) +BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) + EVT_PAINT(MyImageFrame::OnPaint) +END_EVENT_TABLE() + BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) END_EVENT_TABLE() @@ -96,6 +129,10 @@ END_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) : 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; @@ -132,39 +169,60 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxImage image( bitmap ); - if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) ) +#if wxUSE_LIBPNG + if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG )) wxLogError("Can't save file"); - if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) ) + image.Destroy(); + + 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 + image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.jpg") ) ) + 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 @@ -172,19 +230,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() @@ -256,45 +321,72 @@ 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( 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.SetPen( *wxBLACK_PEN ); 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()) { - 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.DrawText( "After wxImage conversion", 150, 1845 ); + dc.SetTextForeground( "BLACK" ); + 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 ); 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.DrawBitmap( i.ConvertToBitmap(), 150, 1900, TRUE ); + dc.SetTextForeground( "BLACK" ); + } + + dc.DrawText("XPM bitmap", 30, 2000); + if ( m_bmpSmileXpm.Ok() ) + { + dc.DrawBitmap(m_bmpSmileXpm, 30, 2020, TRUE); + } + + dc.DrawText("XPM icon", 150, 2000); + if ( m_iconSmileXpm.Ok() ) + { + dc.DrawIcon(m_iconSmileXpm, 150, 2020); } } @@ -351,12 +443,14 @@ void MyCanvas::CreateAntiAliasedBitmap() const int ID_QUIT = 108; const int ID_ABOUT = 109; +const int ID_NEW = 110; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) BEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_MENU (ID_ABOUT, MyFrame::OnAbout) EVT_MENU (ID_QUIT, MyFrame::OnQuit) + EVT_MENU (ID_NEW, MyFrame::OnNewFrame) END_EVENT_TABLE() MyFrame::MyFrame() @@ -364,7 +458,10 @@ MyFrame::MyFrame() wxPoint(20,20), wxSize(470,360) ) { wxMenu *file_menu = new wxMenu(); - file_menu->Append( ID_ABOUT, "&About.."); + file_menu->Append( ID_NEW, "&Show image..."); + file_menu->AppendSeparator(); + file_menu->Append( ID_ABOUT, "&About..."); + file_menu->AppendSeparator(); file_menu->Append( ID_QUIT, "E&xit"); wxMenuBar *menu_bar = new wxMenuBar(); @@ -378,8 +475,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, 220 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) @@ -390,11 +487,27 @@ 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 ); } +void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) +{ + wxString filename = wxFileSelector(_T("Select image file")); + if ( !filename ) + return; + + wxImage image; + if ( !image.LoadFile(filename) ) + { + wxLogError(_T("Couldn't load image from '%s'."), filename.c_str()); + + return; + } + + (new MyImageFrame(this, image.ConvertToBitmap()))->Show(); +} + //----------------------------------------------------------------------------- // MyApp //-----------------------------------------------------------------------------