X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1971d23c57b3c582f32d05704914ad902ec76fa5..c9468a241baaa09bbc82eb45da40a1d15c630f4d:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 2e768ad4ba..c0668f2331 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -52,11 +52,17 @@ public: wxBitmap *my_horse_pnm; wxBitmap *my_horse_tiff; wxBitmap *my_horse_xpm; - + wxBitmap *my_horse_ico32; + wxBitmap *my_horse_ico16; + wxBitmap *my_horse_ico; + wxBitmap *my_horse_cur; + wxBitmap *my_smile_xbm; wxBitmap *my_square; wxBitmap *my_anti; + int xH, yH ; + protected: wxBitmap m_bmpSmileXpm; wxIcon m_iconSmileXpm; @@ -66,8 +72,35 @@ private: 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: @@ -99,40 +132,17 @@ public: void OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc( this ); - dc.DrawBitmap( m_bitmap, 0, 0 ); + //TRUE for masked images + dc.DrawBitmap( m_bitmap, 0, 0, TRUE ); } void OnSave(wxCommandEvent& WXUNUSED(event)) { wxImage image(m_bitmap); - static const wxString bppchoices[8] = - { - "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[WXSIZEOF(bppchoices)] = - { - wxBMP_1BPP, - wxBMP_1BPP_BW, - wxBMP_4BPP, - wxBMP_8BPP, - wxBMP_8BPP_GREY, - wxBMP_8BPP_RED, - wxBMP_8BPP_PALETTE, - wxBMP_24BPP - }; - int bppselection = wxGetSingleChoiceIndex("Set BMP BPP", "Set BMP BPP", - WXSIZEOF(bppchoices), + nChoices, bppchoices, this); if ( bppselection == -1 ) @@ -141,27 +151,29 @@ public: return; } - image.SetOption(wxBMP_FORMAT, bppvalues[bppselection]); + image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, bppvalues[bppselection]); wxString deffilename = bppchoices[bppselection]; - deffilename.Replace(" ", "_"); - deffilename += ".bmp"; - wxString savefilename = wxFileSelector( "Save Image", - "", + deffilename.Replace(wxT(" "), wxT("_")); + deffilename += wxT(".bmp"); + wxString savefilename = wxFileSelector( wxT("Save Image"), + wxT(""), deffilename, - (const char *)NULL, - "BMP files (*.bmp)|*.bmp|" - "PNG files (*.png)|*.png|" - "JPEG files (*.jpg)|*.jpg|" - "GIF files (*.gif)|*.gif|" - "TIFF files (*.tif)|*.tif|" - "PCX files (*.pcx)|*.pcx", + (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|") + wxT("ICO files (*.ico)|*.ico|") + wxT("CUR files (*.cur)|*.cur"), wxSAVE); if ( savefilename.empty() ) return; - if ( image.GetOptionInt(wxBMP_FORMAT) == wxBMP_8BPP_PALETTE ) + if ( image.GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT) == wxBMP_8BPP_PALETTE ) { unsigned char *cmap = new unsigned char [256]; for ( int i = 0; i < 256; i++ ) @@ -187,6 +199,15 @@ public: saved=image.SaveFile(savefilename, wxBITMAP_TYPE_JPEG); else if (extension == "pnm") saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNM); + else if (extension == "ico") + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_ICO); + else if (extension == "cur") + { + image.Rescale(32,32); + image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0); + image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0); + saved=image.SaveFile(savefilename, wxBITMAP_TYPE_CUR); + } else wxMessageBox("Unknown file type, see options in file selector.", "Unknown file type", @@ -240,6 +261,11 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, my_horse_pnm = (wxBitmap*) NULL; my_horse_tiff = (wxBitmap*) NULL; my_horse_xpm = (wxBitmap*) NULL; + my_horse_ico32 = (wxBitmap*) NULL; + my_horse_ico16 = (wxBitmap*) NULL; + my_horse_ico = (wxBitmap*) NULL; + my_horse_cur = (wxBitmap*) NULL; + my_smile_xbm = (wxBitmap*) NULL; my_square = (wxBitmap*) NULL; my_anti = (wxBitmap*) NULL; @@ -250,7 +276,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxMemoryDC dc; dc.SelectObject( bitmap ); - dc.SetBrush( wxBrush( "orange", wxSOLID ) ); + dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) ); dc.SetPen( *wxBLACK_PEN ); dc.DrawRectangle( 0, 0, 100, 100 ); dc.SetBrush( *wxWHITE_BRUSH ); @@ -259,18 +285,18 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, // try to find the directory with our images wxString dir; - if ( wxFile::Exists("./horse.png") ) + if ( wxFile::Exists(wxT("./horse.png")) ) dir = "./"; - else if ( wxFile::Exists("../horse.png") ) + else if ( wxFile::Exists(wxT("../horse.png")) ) dir = "../"; else - wxLogWarning("Can't find image files in either '.' or '..'!"); + wxLogWarning(wxT("Can't find image files in either '.' or '..'!")); wxImage image = bitmap.ConvertToImage(); #if wxUSE_LIBPNG if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG )) - wxLogError("Can't save file"); + wxLogError(wxT("Can't save file")); image.Destroy(); @@ -280,7 +306,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.png")) ) - wxLogError("Can't load PNG image"); + wxLogError(wxT("Can't load PNG image")); else my_horse_png = new wxBitmap( image ); #endif // wxUSE_LIBPNG @@ -289,7 +315,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.jpg")) ) - wxLogError("Can't load JPG image"); + wxLogError(wxT("Can't load JPG image")); else my_horse_jpeg = new wxBitmap( image ); #endif // wxUSE_LIBJPEG @@ -298,7 +324,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.gif")) ) - wxLogError("Can't load GIF image"); + wxLogError(wxT("Can't load GIF image")); else my_horse_gif = new wxBitmap( image ); #endif @@ -307,7 +333,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) ) - wxLogError("Can't load PCX image"); + wxLogError(wxT("Can't load PCX image")); else my_horse_pcx = new wxBitmap( image ); #endif @@ -315,7 +341,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) ) - wxLogError("Can't load BMP image"); + wxLogError(wxT("Can't load BMP image")); else my_horse_bmp = new wxBitmap( image ); @@ -323,19 +349,19 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) ) - wxLogError("Can't load XPM image"); + 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("Can't save file"); + wxLogError(wxT("Can't save file")); #endif #if wxUSE_PNM image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) ) - wxLogError("Can't load PNM image"); + wxLogError(wxT("Can't load PNM image")); else my_horse_pnm = new wxBitmap( image ); #endif @@ -344,7 +370,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) ) - wxLogError("Can't load TIFF image"); + wxLogError(wxT("Can't load TIFF image")); else my_horse_tiff = new wxBitmap( image ); #endif @@ -359,6 +385,42 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, if ( m_bmpSmileXpm.Ok() ) m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM); #endif + +#if wxUSE_ICO_CUR + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) ) + wxLogError(wxT("Can't load first ICO image")); + else + my_horse_ico32 = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) ) + wxLogError(wxT("Can't load second ICO image")); + else + my_horse_ico16 = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.ico") ) ) + wxLogError(wxT("Can't load best ICO image")); + else + my_horse_ico = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + wxString("horse.cur"), wxBITMAP_TYPE_CUR ) ) + wxLogError(wxT("Can't load best ICO image")); + else + { + my_horse_cur = new wxBitmap( image ); + xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ; + yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ; + } + +#endif + } MyCanvas::~MyCanvas() @@ -371,6 +433,9 @@ MyCanvas::~MyCanvas() delete my_horse_pcx; delete my_horse_tiff; delete my_horse_xpm; + delete my_horse_ico32; + delete my_horse_ico16; + delete my_horse_ico; delete my_smile_xbm; delete my_square; delete my_anti; @@ -385,7 +450,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); dc.DrawText( "Drawn directly", 150, 10 ); - dc.SetBrush( wxBrush( "orange", wxSOLID ) ); + dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) ); dc.SetPen( *wxBLACK_PEN ); dc.DrawRectangle( 150, 30, 100, 100 ); dc.SetBrush( *wxWHITE_BRUSH ); @@ -432,18 +497,19 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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( "GREEN" ); - dc.SetTextBackground( "RED" ); + dc.SetTextForeground( wxT("GREEN") ); + dc.SetTextBackground( wxT("RED") ); dc.DrawBitmap( *my_smile_xbm, 30, 2010 ); - dc.SetTextForeground( "BLACK" ); + dc.SetTextForeground( wxT("BLACK") ); dc.DrawText( "After wxImage conversion", 150, 1975 ); dc.DrawText( "(red on white)", 150, 1990 ); - dc.SetTextForeground( "RED" ); + dc.SetTextForeground( wxT("RED") ); wxImage i = my_smile_xbm->ConvertToImage(); i.SetMaskColour( 255, 255, 255 ); i.Replace( 0, 0, 0, @@ -451,7 +517,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Blue() ); dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE ); - dc.SetTextForeground( "BLACK" ); + dc.SetTextForeground( wxT("BLACK") ); } @@ -473,14 +539,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { dc.DrawText( "Mono bitmap", 30, 2095 ); dc.DrawText( "(red on green)", 30, 2110 ); - dc.SetTextForeground( "RED" ); - dc.SetTextBackground( "GREEN" ); + dc.SetTextForeground( wxT("RED") ); + dc.SetTextBackground( wxT("GREEN") ); dc.DrawBitmap( mono, 30, 2130 ); - dc.SetTextForeground( "BLACK" ); + dc.SetTextForeground( wxT("BLACK") ); dc.DrawText( "After wxImage conversion", 150, 2095 ); dc.DrawText( "(red on white)", 150, 2110 ); - dc.SetTextForeground( "RED" ); + dc.SetTextForeground( wxT("RED") ); wxImage i = mono.ConvertToImage(); i.SetMaskColour( 255,255,255 ); i.Replace( 0,0,0, @@ -488,7 +554,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Blue() ); dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE ); - dc.SetTextForeground( "BLACK" ); + dc.SetTextForeground( wxT("BLACK") ); } dc.DrawText("XPM bitmap", 30, 2230); @@ -502,6 +568,27 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { dc.DrawIcon(m_iconSmileXpm, 150, 2250); } + + dc.DrawText( "ICO handler (1st image)", 30, 2290 ); + if (my_horse_ico32 && my_horse_ico32->Ok()) + dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE ); + + dc.DrawText( "ICO handler (2nd image)", 230, 2290 ); + if (my_horse_ico16 && my_horse_ico16->Ok()) + dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE ); + + dc.DrawText( "ICO handler (best image)", 430, 2290 ); + if (my_horse_ico && my_horse_ico->Ok()) + dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE ); + + dc.DrawText( "CUR handler", 30, 2390 ); + if (my_horse_cur && my_horse_cur->Ok()) + { + dc.DrawBitmap( *my_horse_cur, 30, 2420, TRUE ); + dc.SetPen (*wxRED_PEN); + dc.DrawLine (xH-10,yH,xH+10,yH); + dc.DrawLine (xH,yH-10,xH,yH+10); + } } void MyCanvas::CreateAntiAliasedBitmap() @@ -515,7 +602,7 @@ void MyCanvas::CreateAntiAliasedBitmap() 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 ); @@ -589,8 +676,8 @@ MyFrame::MyFrame() m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); - // 500 width * 2100 height - m_canvas->SetScrollbars( 10, 10, 50, 220 ); + // 500 width * 2500 height + m_canvas->SetScrollbars( 10, 10, 50, 250 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) @@ -656,6 +743,11 @@ bool MyApp::OnInit() wxImage::AddHandler( new wxXPMHandler ); #endif +#if wxUSE_ICO_CUR + wxImage::AddHandler( new wxICOHandler ); + wxImage::AddHandler( new wxCURHandler ); +#endif + wxFrame *frame = new MyFrame(); frame->Show( TRUE );