X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e47faf150479ef1171b696bde7ba504c81af481..761df41e86ceeed56d32c038a6c9f88554d4f47a:/samples/image/image.cpp?ds=sidebyside diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 687a1e1f22..c03daca077 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -19,8 +19,14 @@ #endif #include "wx/image.h" - #include "wx/file.h" +#include "wx/mstream.h" +#include "wx/wfstream.h" +#include "wx/quantize.h" + +#include "smile.xbm" +#include "smile.xpm" + // derived classes @@ -44,29 +50,158 @@ public: wxBitmap *my_horse_bmp; wxBitmap *my_horse_pcx; wxBitmap *my_horse_pnm; + wxBitmap *my_horse_tiff; + wxBitmap *my_horse_xpm; + + wxBitmap *my_smile_xbm; wxBitmap *my_square; wxBitmap *my_anti; +protected: + wxBitmap m_bmpSmileXpm; + wxIcon m_iconSmileXpm; + +private: DECLARE_DYNAMIC_CLASS(MyCanvas) DECLARE_EVENT_TABLE() }; + +const int nChoices = 8 ; +static const wxString bppchoices[nChoices] = +{ + "1 bpp color", + "1 bpp B&W", + "4 bpp color", + "8 bpp color", + "8 bpp greyscale", + "8 bpp red", + "8 bpp own palette", + "24 bpp" +}; + +static const int bppvalues[nChoices] = +{ + wxBMP_1BPP, + wxBMP_1BPP_BW, + wxBMP_4BPP, + wxBMP_8BPP, + wxBMP_8BPP_GREY, + wxBMP_8BPP_RED, + wxBMP_8BPP_PALETTE, + wxBMP_24BPP +}; + // MyFrame + class MyFrame: public wxFrame { public: MyFrame(); void OnAbout( wxCommandEvent &event ); + void OnNewFrame( wxCommandEvent &event ); void OnQuit( wxCommandEvent &event ); MyCanvas *m_canvas; +private: DECLARE_DYNAMIC_CLASS(MyFrame) DECLARE_EVENT_TABLE() }; +class MyImageFrame : public wxFrame +{ +public: + MyImageFrame(wxFrame *parent, const wxBitmap& bitmap) + : wxFrame(parent, -1, _T("Double click to save"), + 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 ); + } + + void OnSave(wxCommandEvent& WXUNUSED(event)) + { + wxImage image(m_bitmap); + + int bppselection = wxGetSingleChoiceIndex("Set BMP BPP", + "Set BMP BPP", + nChoices, + bppchoices, + this); + if ( bppselection == -1 ) + { + // cancelled + return; + } + + image.SetOption(wxBMP_FORMAT, bppvalues[bppselection]); + + wxString deffilename = bppchoices[bppselection]; + deffilename.Replace(wxT(" "), wxT("_")); + deffilename += wxT(".bmp"); + wxString savefilename = wxFileSelector( wxT("Save Image"), + wxT(""), + deffilename, + (const wxChar *)NULL, + wxT("BMP files (*.bmp)|*.bmp|") + wxT("PNG files (*.png)|*.png|") + wxT("JPEG files (*.jpg)|*.jpg|") + wxT("GIF files (*.gif)|*.gif|") + wxT("TIFF files (*.tif)|*.tif|") + wxT("PCX files (*.pcx)|*.pcx"), + wxSAVE); + + if ( savefilename.empty() ) + return; + + if ( image.GetOptionInt(wxBMP_FORMAT) == wxBMP_8BPP_PALETTE ) + { + unsigned char *cmap = new unsigned char [256]; + for ( int i = 0; i < 256; i++ ) + cmap[i] = i; + image.SetPalette(wxPalette(256, cmap, cmap, cmap)); + + delete cmap; + } + + bool saved = FALSE; + + wxString extension = savefilename.AfterLast('.').Lower(); + + if (extension == "bmp") + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_BMP); + else if (extension == "png") + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNG); + else if (extension == "pcx") + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PCX); + else if ((extension == "tif") || (extension == "tiff")) + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_TIF); + else if (extension == "jpg") + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_JPEG); + else if (extension == "pnm") + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNM); + else + wxMessageBox("Unknown file type, see options in file selector.", + "Unknown file type", + wxOK|wxCENTRE, this); + } + +private: + wxBitmap m_bitmap; + + DECLARE_EVENT_TABLE() +}; + // MyApp class MyApp: public wxApp @@ -83,6 +218,11 @@ IMPLEMENT_APP(MyApp) IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow) +BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) + EVT_PAINT(MyImageFrame::OnPaint) + EVT_LEFT_DCLICK(MyImageFrame::OnSave) +END_EVENT_TABLE() + BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) END_EVENT_TABLE() @@ -90,127 +230,281 @@ 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; - 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; + 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_horse_tiff = (wxBitmap*) NULL; + my_horse_xpm = (wxBitmap*) NULL; + my_smile_xbm = (wxBitmap*) NULL; + my_square = (wxBitmap*) NULL; + my_anti = (wxBitmap*) NULL; + + SetBackgroundColour(* wxWHITE); + + wxBitmap bitmap( 100, 100 ); + + wxMemoryDC dc; + dc.SelectObject( bitmap ); + dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) ); + 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 + wxString dir; + if ( wxFile::Exists(wxT("./horse.png")) ) + dir = "./"; + else if ( wxFile::Exists(wxT("../horse.png")) ) + dir = "../"; + else + wxLogWarning(wxT("Can't find image files in either '.' or '..'!")); + + wxImage image = bitmap.ConvertToImage(); - SetBackgroundColour(* wxWHITE); +#if wxUSE_LIBPNG + if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG )) + wxLogError(wxT("Can't save file")); - wxBitmap bitmap( 100, 100 ); + image.Destroy(); - wxMemoryDC dc; - dc.SelectObject( bitmap ); - dc.SetBrush( wxBrush( "orange", wxSOLID ) ); - dc.SetPen( *wxWHITE_PEN ); - dc.DrawRectangle( 0, 0, 100, 100 ); - dc.SelectObject( wxNullBitmap ); - - // 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 ); - - 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 ) ) - wxLogError("Can't load PNG image"); - else - my_horse_png = 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() ); + image.LoadFile( dir + wxString("test.png") ); + my_square = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.png")) ) + wxLogError(wxT("Can't load PNG image")); + else + my_horse_png = new wxBitmap( image ); +#endif // wxUSE_LIBPNG + +#if wxUSE_LIBJPEG + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.jpg")) ) + wxLogError(wxT("Can't load JPG image")); + else + my_horse_jpeg = new wxBitmap( image ); +#endif // wxUSE_LIBJPEG #if wxUSE_GIF - if ( !image.LoadFile( dir + wxString("horse.gif") ) ) - wxLogError("Can't load GIF image"); - else - my_horse_gif = new wxBitmap( image.ConvertToBitmap() ); + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.gif")) ) + wxLogError(wxT("Can't load GIF image")); + else + my_horse_gif = new wxBitmap( image ); #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() ); + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) ) + wxLogError(wxT("Can't load PCX image")); + else + my_horse_pcx = new wxBitmap( image ); #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() ); + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) ) + wxLogError(wxT("Can't load BMP image")); + else + my_horse_bmp = new wxBitmap( image ); + +#if wxUSE_XPM + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) ) + wxLogError(wxT("Can't load XPM image")); + else + my_horse_xpm = new wxBitmap( image ); + + if ( !image.SaveFile( dir + wxString("test.xpm"), wxBITMAP_TYPE_XPM )) + wxLogError(wxT("Can't save file")); +#endif #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() ); + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) ) + wxLogError(wxT("Can't load PNM image")); + else + my_horse_pnm = new wxBitmap( image ); +#endif + +#if wxUSE_LIBTIFF + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) ) + wxLogError(wxT("Can't load TIFF image")); + else + my_horse_tiff = new wxBitmap( image ); +#endif + + CreateAntiAliasedBitmap(); + + my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width, + smile_height, 1 ); + +#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 - - image.LoadFile( dir + wxString("test.png") ); - my_square = new wxBitmap( image.ConvertToBitmap() ); - - CreateAntiAliasedBitmap(); } 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; + 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_horse_tiff; + delete my_horse_xpm; + delete my_smile_xbm; + delete my_square; + delete my_anti; } void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxPaintDC dc( this ); - PrepareDC( dc ); - - dc.DrawText( "Loaded image", 30, 10 ); - if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); - - dc.DrawText( "Drawn directly", 150, 10 ); - dc.SetBrush( wxBrush( "orange", wxSOLID ) ); - dc.SetPen( *wxWHITE_PEN ); - dc.DrawRectangle( 150, 30, 100, 100 ); - - if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 ); - - dc.DrawText( "PNG handler", 30, 135 ); - if (my_horse_png && my_horse_png->Ok()) dc.DrawBitmap( *my_horse_png, 30, 150 ); - - dc.DrawText( "JPEG handler", 30, 365 ); - 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()) 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 ); + wxPaintDC dc( this ); + PrepareDC( dc ); + + dc.DrawText( "Loaded image", 30, 10 ); + if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); + + dc.DrawText( "Drawn directly", 150, 10 ); + dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) ); + 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()) + 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) ); + dc.DrawText( "GetSubBitmap()", 280, 190 ); + dc.DrawBitmap( sub, 280, 210 ); + } + + dc.DrawText( "JPEG handler", 30, 365 ); + 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()) + 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 ); + + dc.DrawText( "TIFF handler", 30, 1515 ); + if (my_horse_tiff && my_horse_tiff->Ok()) + dc.DrawBitmap( *my_horse_tiff, 30, 1530 ); + + dc.DrawText( "XPM handler", 30, 1745 ); + if (my_horse_xpm && my_horse_xpm->Ok()) + dc.DrawBitmap( *my_horse_xpm, 30, 1760 ); + + if (my_smile_xbm && my_smile_xbm->Ok()) + { + dc.DrawText( "XBM bitmap", 30, 1975 ); + dc.DrawText( "(green on red)", 30, 1990 ); + dc.SetTextForeground( wxT("GREEN") ); + dc.SetTextBackground( wxT("RED") ); + dc.DrawBitmap( *my_smile_xbm, 30, 2010 ); + + dc.SetTextForeground( wxT("BLACK") ); + dc.DrawText( "After wxImage conversion", 150, 1975 ); + dc.DrawText( "(red on white)", 150, 1990 ); + dc.SetTextForeground( wxT("RED") ); + wxImage i = my_smile_xbm->ConvertToImage(); + 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, 2010, TRUE ); + dc.SetTextForeground( wxT("BLACK") ); + } + + + wxBitmap mono( 60,50,1 ); + wxMemoryDC memdc; + memdc.SelectObject( mono ); + memdc.SetPen( *wxBLACK_PEN ); + memdc.SetBrush( *wxWHITE_BRUSH ); + 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, 2095 ); + dc.DrawText( "(red on green)", 30, 2110 ); + dc.SetTextForeground( wxT("RED") ); + dc.SetTextBackground( wxT("GREEN") ); + dc.DrawBitmap( mono, 30, 2130 ); + + dc.SetTextForeground( wxT("BLACK") ); + dc.DrawText( "After wxImage conversion", 150, 2095 ); + dc.DrawText( "(red on white)", 150, 2110 ); + dc.SetTextForeground( wxT("RED") ); + wxImage i = mono.ConvertToImage(); + 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, 2130, TRUE ); + dc.SetTextForeground( wxT("BLACK") ); + } + + dc.DrawText("XPM bitmap", 30, 2230); + if ( m_bmpSmileXpm.Ok() ) + { + dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE); + } + + dc.DrawText("XPM icon", 150, 2230); + if ( m_iconSmileXpm.Ok() ) + { + dc.DrawIcon(m_iconSmileXpm, 150, 2250); + } } void MyCanvas::CreateAntiAliasedBitmap() @@ -222,41 +516,41 @@ void MyCanvas::CreateAntiAliasedBitmap() dc.SelectObject( bitmap ); dc.Clear(); - + dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) ); - dc.SetTextForeground( "RED" ); + dc.SetTextForeground( wxT("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 ); + + wxImage original= bitmap.ConvertToImage(); wxImage anti( 150, 150 ); /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */ - + for (int y = 1; y < 149; y++) for (int x = 1; x < 149; x++) { int red = original.GetRed( x*2, y*2 ) + - original.GetRed( x*2-1, y*2 ) + - original.GetRed( x*2, y*2+1 ) + + original.GetRed( x*2-1, y*2 ) + + original.GetRed( x*2, y*2+1 ) + original.GetRed( x*2+1, y*2+1 ); - red = red/4; - + red = red/4; + int green = original.GetGreen( x*2, y*2 ) + - original.GetGreen( x*2-1, y*2 ) + - original.GetGreen( x*2, y*2+1 ) + + original.GetGreen( x*2-1, y*2 ) + + original.GetGreen( x*2, y*2+1 ) + original.GetGreen( x*2+1, y*2+1 ); - green = green/4; - + green = green/4; + int blue = original.GetBlue( x*2, y*2 ) + - original.GetBlue( x*2-1, y*2 ) + - original.GetBlue( x*2, y*2+1 ) + + original.GetBlue( x*2-1, y*2 ) + + original.GetBlue( x*2, y*2+1 ) + original.GetBlue( x*2+1, y*2+1 ); - blue = blue/4; + blue = blue/4; anti.SetRGB( x, y, red, green, blue ); } my_anti = new wxBitmap( anti.ConvertToBitmap() ); @@ -266,12 +560,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() @@ -279,7 +575,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(); @@ -293,8 +592,8 @@ MyFrame::MyFrame() m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); - // 500 width * 1300 height - m_canvas->SetScrollbars( 10, 10, 50, 152 ); + // 500 width * 2100 height + m_canvas->SetScrollbars( 10, 10, 50, 220 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) @@ -305,11 +604,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 //----------------------------------------------------------------------------- @@ -324,6 +639,10 @@ bool MyApp::OnInit() wxImage::AddHandler( new wxJPEGHandler ); #endif +#if wxUSE_LIBTIFF + wxImage::AddHandler( new wxTIFFHandler ); +#endif + #if wxUSE_GIF wxImage::AddHandler( new wxGIFHandler ); #endif @@ -336,6 +655,10 @@ bool MyApp::OnInit() wxImage::AddHandler( new wxPNMHandler ); #endif +#if wxUSE_XPM + wxImage::AddHandler( new wxXPMHandler ); +#endif + wxFrame *frame = new MyFrame(); frame->Show( TRUE );