X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58dea4b0673c76bdd3ef5624f65fa341b7d5f7b0..e78c4d503ecd57835502fb1bbd13a71cb99019d0:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 2b923cb1fb..687a1e1f22 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -20,6 +20,8 @@ #include "wx/image.h" +#include "wx/file.h" + // derived classes class MyFrame; @@ -39,6 +41,9 @@ public: wxBitmap *my_horse_png; wxBitmap *my_horse_jpeg; wxBitmap *my_horse_gif; + wxBitmap *my_horse_bmp; + wxBitmap *my_horse_pcx; + wxBitmap *my_horse_pnm; wxBitmap *my_square; wxBitmap *my_anti; @@ -89,6 +94,9 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, my_horse_png = (wxBitmap*) NULL; my_horse_jpeg = (wxBitmap*) NULL; my_horse_gif = (wxBitmap*) NULL; + my_horse_bmp = (wxBitmap*) NULL; + my_horse_pcx = (wxBitmap*) NULL; + my_horse_pnm = (wxBitmap*) NULL; my_square = (wxBitmap*) NULL; my_anti = (wxBitmap*) NULL; @@ -103,25 +111,57 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, dc.DrawRectangle( 0, 0, 100, 100 ); dc.SelectObject( wxNullBitmap ); - wxString dir(""); - -#ifdef __WXGTK__ - dir = wxString("../"); -#endif + // try to find the directory with our images + wxString dir; + if ( wxFile::Exists("./horse.png") ) + dir = "./"; + else if ( wxFile::Exists("../horse.png") ) + dir = "../"; + else + wxLogWarning("Can't find image files in either '.' or '..'!"); wxImage image( bitmap ); - image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ); - image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ); - my_horse_png = new wxBitmap( image.ConvertToBitmap() ); + if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) ) + wxLogError("Can't save file"); - image.LoadFile( dir + wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ); - my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() ); + if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) ) + wxLogError("Can't load PNG image"); + else + my_horse_png = new wxBitmap( image.ConvertToBitmap() ); - image.LoadFile( dir + wxString("horse.gif"), wxBITMAP_TYPE_GIF ); - my_horse_gif = new wxBitmap( image.ConvertToBitmap() ); + if ( !image.LoadFile( dir + wxString("horse.jpg") ) ) + wxLogError("Can't load JPG image"); + else + my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() ); + +#if wxUSE_GIF + 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 + 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 + + 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 + if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) ) + wxLogError("Can't load PNM image"); + else + my_horse_pnm = new wxBitmap( image.ConvertToBitmap() ); +#endif - image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ); + image.LoadFile( dir + wxString("test.png") ); my_square = new wxBitmap( image.ConvertToBitmap() ); CreateAntiAliasedBitmap(); @@ -129,9 +169,12 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, MyCanvas::~MyCanvas() { + delete my_horse_pnm; delete my_horse_png; delete my_horse_jpeg; delete my_horse_gif; + delete my_horse_bmp; + delete my_horse_pcx; delete my_square; delete my_anti; } @@ -159,6 +202,15 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawText( "GIF handler", 30, 595 ); 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()) dc.DrawBitmap( *my_horse_pcx, 30, 840 ); + + dc.DrawText( "BMP handler", 30, 1055 ); + 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()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 ); } void MyCanvas::CreateAntiAliasedBitmap() @@ -171,12 +223,13 @@ void MyCanvas::CreateAntiAliasedBitmap() dc.Clear(); - dc.SetFont( wxFont( 24, wxDECORATIVE, wxDEFAULT, wxDEFAULT ) ); + dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) ); dc.SetTextForeground( "RED" ); dc.DrawText( "This is anti-aliased Text.", 20, 20 ); dc.DrawText( "And a Rectangle.", 20, 60 ); dc.SetBrush( *wxRED_BRUSH ); + dc.SetPen( *wxTRANSPARENT_PEN ); dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 ); wxImage original( bitmap ); @@ -226,11 +279,11 @@ MyFrame::MyFrame() wxPoint(20,20), wxSize(470,360) ) { wxMenu *file_menu = new wxMenu(); - file_menu->Append( ID_ABOUT, "About.."); - file_menu->Append( ID_QUIT, "Exit"); + file_menu->Append( ID_ABOUT, "&About.."); + file_menu->Append( ID_QUIT, "E&xit"); wxMenuBar *menu_bar = new wxMenuBar(); - menu_bar->Append(file_menu, "File"); + menu_bar->Append(file_menu, "&File"); SetMenuBar( menu_bar ); @@ -239,7 +292,9 @@ MyFrame::MyFrame() SetStatusWidths( 2, widths ); m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); - m_canvas->SetScrollbars( 10, 10, 50, 100 ); + + // 500 width * 1300 height + m_canvas->SetScrollbars( 10, 10, 50, 152 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) @@ -250,6 +305,7 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { (void)wxMessageBox( "wxImage demo\n" + "\n" "Robert Roebling (c) 1998", "About wxImage Demo", wxICON_INFORMATION | wxOK ); } @@ -268,7 +324,17 @@ bool MyApp::OnInit() wxImage::AddHandler( new wxJPEGHandler ); #endif +#if wxUSE_GIF wxImage::AddHandler( new wxGIFHandler ); +#endif + +#if wxUSE_PCX + wxImage::AddHandler( new wxPCXHandler ); +#endif + +#if wxUSE_PNM + wxImage::AddHandler( new wxPNMHandler ); +#endif wxFrame *frame = new MyFrame(); frame->Show( TRUE );