X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a60b1f5d5792008dfbb71094a6b6d3c29e11fc20..0d8b87ac8ae0ababd4c0d725142532f6d592fdb2:/samples/image/image.cpp?ds=inline diff --git a/samples/image/image.cpp b/samples/image/image.cpp index c03daca077..7d6f8acd75 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -24,9 +24,22 @@ #include "wx/wfstream.h" #include "wx/quantize.h" +#if wxUSE_CLIPBOARD + #include "wx/dataobj.h" + #include "wx/clipbrd.h" +#endif // wxUSE_CLIPBOARD + #include "smile.xbm" -#include "smile.xpm" +#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW + #include "smile.xpm" +#endif + +#if defined(__WXMSW__) || defined(__WXMAC__) + #ifdef wxHAVE_RAW_BITMAP + #include "wx/rawbmp.h" + #endif +#endif // derived classes @@ -38,7 +51,7 @@ class MyApp; class MyCanvas: public wxScrolledWindow { public: - MyCanvas() {}; + MyCanvas() {} MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size ); ~MyCanvas(); void OnPaint( wxPaintEvent &event ); @@ -48,15 +61,24 @@ public: wxBitmap *my_horse_jpeg; wxBitmap *my_horse_gif; wxBitmap *my_horse_bmp; + wxBitmap *my_horse_bmp2; wxBitmap *my_horse_pcx; 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_horse_ani; wxBitmap *my_smile_xbm; wxBitmap *my_square; wxBitmap *my_anti; + int xH, yH ; + int m_ani_images ; + protected: wxBitmap m_bmpSmileXpm; wxIcon m_iconSmileXpm; @@ -70,14 +92,14 @@ private: 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" + _T("1 bpp color"), + _T("1 bpp B&W"), + _T("4 bpp color"), + _T("8 bpp color"), + _T("8 bpp greyscale"), + _T("8 bpp red"), + _T("8 bpp own palette"), + _T("24 bpp") }; static const int bppvalues[nChoices] = @@ -102,8 +124,16 @@ public: void OnAbout( wxCommandEvent &event ); void OnNewFrame( wxCommandEvent &event ); +#ifdef wxHAVE_RAW_BITMAP + void OnTestRawBitmap( wxCommandEvent &event ); +#endif // wxHAVE_RAW_BITMAP void OnQuit( wxCommandEvent &event ); +#if wxUSE_CLIPBOARD + void OnCopy(wxCommandEvent& event); + void OnPaste(wxCommandEvent& event); +#endif // wxUSE_CLIPBOARD + MyCanvas *m_canvas; private: @@ -117,24 +147,29 @@ public: MyImageFrame(wxFrame *parent, const wxBitmap& bitmap) : wxFrame(parent, -1, _T("Double click to save"), wxDefaultPosition, wxDefaultSize, - wxCAPTION | wxSYSTEM_MENU), + wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX), m_bitmap(bitmap) { SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); } + void OnEraseBackground(wxEraseEvent& WXUNUSED(event)) + { + // do nothing here to be able to see how transparent images are shown + } + void OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc( this ); - dc.DrawBitmap( m_bitmap, 0, 0 ); + dc.DrawBitmap( m_bitmap, 0, 0, TRUE /* use mask */ ); } - void OnSave(wxCommandEvent& WXUNUSED(event)) + void OnSave(wxMouseEvent& WXUNUSED(event)) { - wxImage image(m_bitmap); + wxImage image = m_bitmap.ConvertToImage(); - int bppselection = wxGetSingleChoiceIndex("Set BMP BPP", - "Set BMP BPP", + int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"), + _T("Set BMP BPP"), nChoices, bppchoices, this); @@ -144,7 +179,7 @@ public: return; } - image.SetOption(wxBMP_FORMAT, bppvalues[bppselection]); + image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, bppvalues[bppselection]); wxString deffilename = bppchoices[bppselection]; deffilename.Replace(wxT(" "), wxT("_")); @@ -158,13 +193,15 @@ public: wxT("JPEG files (*.jpg)|*.jpg|") wxT("GIF files (*.gif)|*.gif|") wxT("TIFF files (*.tif)|*.tif|") - wxT("PCX files (*.pcx)|*.pcx"), + 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++ ) @@ -174,25 +211,28 @@ public: delete cmap; } - bool saved = FALSE; - + bool loaded; 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); + if (extension == _T("cur")) + { + image.Rescale(32,32); + image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0); + image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0); + // This shows how you can save an image with explicitly + // specified image format: + loaded = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR); + } else - wxMessageBox("Unknown file type, see options in file selector.", - "Unknown file type", + { + // This one guesses image format from filename extension + // (it may fail if the extension is not recognized): + loaded = image.SaveFile(savefilename); + } + + if ( !loaded ) + wxMessageBox(_T("No handler for this file type."), + _T("File was not saved"), wxOK|wxCENTRE, this); } @@ -202,6 +242,81 @@ private: DECLARE_EVENT_TABLE() }; +#ifdef wxHAVE_RAW_BITMAP + +#include "wx/rawbmp.h" + +class MyRawBitmapFrame : public wxFrame +{ +public: + enum + { + BORDER = 15, + SIZE = 150, + REAL_SIZE = SIZE - 2*BORDER + }; + + MyRawBitmapFrame(wxFrame *parent) + : wxFrame(parent, -1, _T("Raw bitmaps (how exciting)")), + m_bitmap(SIZE, SIZE, 32) + { + SetClientSize(SIZE, SIZE); + + // another possibility: wxNativePixelData (don't forget to remove code + // setting alpha in the loop below then) + typedef wxAlphaPixelData Data; + + Data data(m_bitmap, wxPoint(BORDER, BORDER), wxSize(REAL_SIZE, REAL_SIZE)); + if ( !data ) + { + wxLogError(_T("Failed to gain raw access to bitmap data")); + return; + } + + data.UseAlpha(); + + Data::Iterator p(data); + + for ( int y = 0; y < REAL_SIZE; ++y ) + { + Data::Iterator rowStart = p; + + int r = y < REAL_SIZE/3 ? 255 : 0, + g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0, + b = 2*(REAL_SIZE/3) <= y ? 255 : 0; + + for ( int x = 0; x < REAL_SIZE; ++x ) + { + p.Red() = r; + p.Green() = g; + p.Blue() = b; + p.Alpha() = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE); + + ++p; // same as p.OffsetX(1) + } + + p = rowStart; + p.OffsetY(data, 1); + } + } + + void OnPaint(wxPaintEvent& WXUNUSED(event)) + { + wxPaintDC dc( this ); + dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER); + dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER); + dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER); + dc.DrawBitmap( m_bitmap, 0, 0, TRUE /* use mask */ ); + } + +private: + wxBitmap m_bitmap; + + DECLARE_EVENT_TABLE() +}; + +#endif // wxHAVE_RAW_BITMAP + // MyApp class MyApp: public wxApp @@ -219,10 +334,19 @@ IMPLEMENT_APP(MyApp) IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow) BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) - EVT_PAINT(MyImageFrame::OnPaint) - EVT_LEFT_DCLICK(MyImageFrame::OnSave) + EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground) + EVT_PAINT(MyImageFrame::OnPaint) + EVT_LEFT_DCLICK(MyImageFrame::OnSave) +END_EVENT_TABLE() + +#ifdef wxHAVE_RAW_BITMAP + +BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame) + EVT_PAINT(MyRawBitmapFrame::OnPaint) END_EVENT_TABLE() +#endif // wxHAVE_RAW_BITMAP + BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) END_EVENT_TABLE() @@ -239,14 +363,23 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, my_horse_jpeg = (wxBitmap*) NULL; my_horse_gif = (wxBitmap*) NULL; my_horse_bmp = (wxBitmap*) NULL; + my_horse_bmp2 = (wxBitmap*) NULL; my_horse_pcx = (wxBitmap*) NULL; 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_horse_ani = (wxBitmap*) NULL; + my_smile_xbm = (wxBitmap*) NULL; my_square = (wxBitmap*) NULL; my_anti = (wxBitmap*) NULL; + m_ani_images = 0 ; + SetBackgroundColour(* wxWHITE); wxBitmap bitmap( 100, 100 ); @@ -263,26 +396,26 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, // try to find the directory with our images wxString dir; if ( wxFile::Exists(wxT("./horse.png")) ) - dir = "./"; + dir = wxT("./"); else if ( wxFile::Exists(wxT("../horse.png")) ) - dir = "../"; + dir = wxT("../"); else 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 )) + if ( !image.SaveFile( dir + _T("test.png"), wxBITMAP_TYPE_PNG )) wxLogError(wxT("Can't save file")); image.Destroy(); - image.LoadFile( dir + wxString("test.png") ); - my_square = new wxBitmap( image ); + if ( image.LoadFile( dir + _T("test.png") ) ) + my_square = new wxBitmap( image ); image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.png")) ) + if ( !image.LoadFile( dir + _T("horse.png")) ) wxLogError(wxT("Can't load PNG image")); else my_horse_png = new wxBitmap( image ); @@ -291,7 +424,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #if wxUSE_LIBJPEG image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.jpg")) ) + if ( !image.LoadFile( dir + _T("horse.jpg")) ) wxLogError(wxT("Can't load JPG image")); else my_horse_jpeg = new wxBitmap( image ); @@ -300,7 +433,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #if wxUSE_GIF image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.gif")) ) + if ( !image.LoadFile( dir + _T("horse.gif" )) ) wxLogError(wxT("Can't load GIF image")); else my_horse_gif = new wxBitmap( image ); @@ -309,7 +442,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #if wxUSE_PCX image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) ) + if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) ) wxLogError(wxT("Can't load PCX image")); else my_horse_pcx = new wxBitmap( image ); @@ -317,7 +450,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) ) + if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) ) wxLogError(wxT("Can't load BMP image")); else my_horse_bmp = new wxBitmap( image ); @@ -325,19 +458,19 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #if wxUSE_XPM image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) ) + if ( !image.LoadFile( dir + _T("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 )) + if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM )) wxLogError(wxT("Can't save file")); #endif #if wxUSE_PNM image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) ) + if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) ) wxLogError(wxT("Can't load PNM image")); else my_horse_pnm = new wxBitmap( image ); @@ -346,7 +479,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #if wxUSE_LIBTIFF image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) ) + if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) ) wxLogError(wxT("Can't load TIFF image")); else my_horse_tiff = new wxBitmap( image ); @@ -360,8 +493,83 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #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); + m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM); #endif + +#if wxUSE_ICO_CUR + image.Destroy(); + + if ( !image.LoadFile( dir + _T("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 + _T("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 + _T("horse.ico") ) ) + wxLogError(wxT("Can't load best ICO image")); + else + my_horse_ico = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + _T("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) ; + } + + m_ani_images = wxImage::GetImageCount ( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI ); + if (m_ani_images==0) + wxLogError(wxT("No ANI-format images found")); + else + my_horse_ani = new wxBitmap [m_ani_images]; + int i ; + for (i=0; i < m_ani_images; i++) + { + image.Destroy(); + if (!image.LoadFile( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI, i )) + { + wxString tmp = wxT("Can't load image number "); + tmp << i ; + wxLogError(tmp); + } + else + my_horse_ani [i] = wxBitmap( image ); + } +#endif // wxUSE_ICO_CUR + + image.Destroy(); + + // test image loading from stream + wxFile file(dir + _T("horse.bmp")); + if ( file.IsOpened() ) + { + off_t len = file.Length(); + void *data = malloc(len); + if ( file.Read(data, len) != len ) + wxLogError(_T("Reading bitmap file failed")); + else + { + wxMemoryInputStream mis(data, len); + if ( !image.LoadFile(mis) ) + wxLogError(wxT("Can't load BMP image from stream")); + else + my_horse_bmp2 = new wxBitmap( image ); + } + + free(data); + } } MyCanvas::~MyCanvas() @@ -371,9 +579,15 @@ MyCanvas::~MyCanvas() delete my_horse_jpeg; delete my_horse_gif; delete my_horse_bmp; + delete my_horse_bmp2; 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_horse_cur; + delete [] my_horse_ani; delete my_smile_xbm; delete my_square; delete my_anti; @@ -384,10 +598,10 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc( this ); PrepareDC( dc ); - dc.DrawText( "Loaded image", 30, 10 ); + dc.DrawText( _T("Loaded image"), 30, 10 ); if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); - dc.DrawText( "Drawn directly", 150, 10 ); + dc.DrawText( _T("Drawn directly"), 150, 10 ); dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) ); dc.SetPen( *wxBLACK_PEN ); dc.DrawRectangle( 150, 30, 100, 100 ); @@ -397,55 +611,60 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 280, 30 ); - dc.DrawText( "PNG handler", 30, 135 ); + dc.DrawText( _T("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.DrawText( _T("GetSubBitmap()"), 280, 190 ); dc.DrawBitmap( sub, 280, 210 ); } - dc.DrawText( "JPEG handler", 30, 365 ); + dc.DrawText( _T("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 ); + dc.DrawText( _T("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 ); + dc.DrawText( _T("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 ); + dc.DrawText( _T("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 ); + dc.DrawText( _T("BMP read from memory"), 280, 1055 ); + if (my_horse_bmp2 && my_horse_bmp2->Ok()) + dc.DrawBitmap( *my_horse_bmp2, 280, 1070 ); + + dc.DrawText( _T("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 ); + dc.DrawText( _T("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 ); + dc.DrawText( _T("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.DrawText( _T("XBM bitmap"), 30, 1975 ); + dc.DrawText( _T("(green on red)"), 30, 1990 ); + dc.SetTextForeground( _T("GREEN") ); + dc.SetTextBackground( _T("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.DrawText( _T("After wxImage conversion"), 150, 1975 ); + dc.DrawText( _T("(red on white)"), 150, 1990 ); dc.SetTextForeground( wxT("RED") ); wxImage i = my_smile_xbm->ConvertToImage(); i.SetMaskColour( 255, 255, 255 ); @@ -453,7 +672,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxRED_PEN->GetColour().Red(), wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE ); + dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE ); dc.SetTextForeground( wxT("BLACK") ); } @@ -465,7 +684,10 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) memdc.SetBrush( *wxWHITE_BRUSH ); memdc.DrawRectangle( 0,0,60,50 ); memdc.SetTextForeground( *wxBLACK ); - memdc.DrawText( "Hi!", 5, 5 ); +#ifndef __WXGTK20__ + // I cannot convince GTK2 to draw into mono bitmaps + memdc.DrawText( _T("Hi!"), 5, 5 ); +#endif memdc.SetBrush( *wxBLACK_BRUSH ); memdc.DrawRectangle( 33,5,20,20 ); memdc.SetPen( *wxRED_PEN ); @@ -474,15 +696,15 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (mono.Ok()) { - dc.DrawText( "Mono bitmap", 30, 2095 ); - dc.DrawText( "(red on green)", 30, 2110 ); + dc.DrawText( _T("Mono bitmap"), 30, 2095 ); + dc.DrawText( _T("(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.DrawText( _T("After wxImage conversion"), 150, 2095 ); + dc.DrawText( _T("(red on white)"), 150, 2110 ); dc.SetTextForeground( wxT("RED") ); wxImage i = mono.ConvertToImage(); i.SetMaskColour( 255,255,255 ); @@ -490,21 +712,73 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxRED_PEN->GetColour().Red(), wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE ); + dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE ); dc.SetTextForeground( wxT("BLACK") ); } - dc.DrawText("XPM bitmap", 30, 2230); + // For testing transparency + dc.SetBrush( *wxRED_BRUSH ); + dc.DrawRectangle( 20, 2220, 560, 68 ); + + dc.DrawText(_T("XPM bitmap"), 30, 2230 ); if ( m_bmpSmileXpm.Ok() ) - { dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE); - } - dc.DrawText("XPM icon", 150, 2230); + dc.DrawText(_T("XPM icon"), 110, 2230 ); if ( m_iconSmileXpm.Ok() ) + dc.DrawIcon(m_iconSmileXpm, 110, 2250); + + // testing icon -> bitmap conversion + wxBitmap to_blit( m_iconSmileXpm ); + + dc.DrawText( _T("SubBitmap"), 170, 2230 ); + wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) ); + dc.DrawBitmap( sub, 170, 2250, TRUE ); + + dc.DrawText( _T("Enlarged"), 250, 2230 ); + dc.SetUserScale( 1.5, 1.5 ); + dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5), TRUE ); + dc.SetUserScale( 2, 2 ); + dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2), TRUE ); + dc.SetUserScale( 1.0, 1.0 ); + + dc.DrawText( _T("Blit"), 400, 2230); + wxMemoryDC blit_dc; + blit_dc.SelectObject( to_blit ); + dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, TRUE ); + dc.SetUserScale( 1.5, 1.5 ); + dc.Blit( (int)(450/1.5), (int)(2250/1.5), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, TRUE ); + dc.SetUserScale( 2, 2 ); + dc.Blit( (int)(500/2), (int)(2250/2), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, TRUE ); + dc.SetUserScale( 1.0, 1.0 ); + + dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 ); + if (my_horse_ico32 && my_horse_ico32->Ok()) + dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE ); + + dc.DrawText( _T("ICO handler (2nd image)"), 230, 2290 ); + if (my_horse_ico16 && my_horse_ico16->Ok()) + dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE ); + + dc.DrawText( _T("ICO handler (best image)"), 430, 2290 ); + if (my_horse_ico && my_horse_ico->Ok()) + dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE ); + + dc.DrawText( _T("CUR handler"), 30, 2390 ); + if (my_horse_cur && my_horse_cur->Ok()) { - dc.DrawIcon(m_iconSmileXpm, 150, 2250); + 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); } + dc.DrawText( _T("ANI handler"), 230, 2390 ); + int i ; + for (i=0; i < m_ani_images; i ++) + if (my_horse_ani[i].Ok()) + { + dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, TRUE ); + } } void MyCanvas::CreateAntiAliasedBitmap() @@ -519,8 +793,8 @@ void MyCanvas::CreateAntiAliasedBitmap() dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) ); dc.SetTextForeground( wxT("RED") ); - dc.DrawText( "This is anti-aliased Text.", 20, 20 ); - dc.DrawText( "And a Rectangle.", 20, 60 ); + dc.DrawText( _T("This is anti-aliased Text."), 20, 20 ); + dc.DrawText( _T("And a Rectangle."), 20, 60 ); dc.SetBrush( *wxRED_BRUSH ); dc.SetPen( *wxTRANSPARENT_PEN ); @@ -553,14 +827,18 @@ void MyCanvas::CreateAntiAliasedBitmap() blue = blue/4; anti.SetRGB( x, y, red, green, blue ); } - my_anti = new wxBitmap( anti.ConvertToBitmap() ); + my_anti = new wxBitmap(anti); } // MyFrame -const int ID_QUIT = 108; -const int ID_ABOUT = 109; -const int ID_NEW = 110; +enum +{ + ID_QUIT = 108, + ID_ABOUT, + ID_NEW, + ID_SHOWRAW +}; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) @@ -568,21 +846,40 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_MENU (ID_ABOUT, MyFrame::OnAbout) EVT_MENU (ID_QUIT, MyFrame::OnQuit) EVT_MENU (ID_NEW, MyFrame::OnNewFrame) +#ifdef wxHAVE_RAW_BITMAP + EVT_MENU (ID_SHOWRAW, MyFrame::OnTestRawBitmap) +#endif + +#if wxUSE_CLIPBOARD + EVT_MENU(wxID_COPY, MyFrame::OnCopy) + EVT_MENU(wxID_PASTE, MyFrame::OnPaste) +#endif // wxUSE_CLIPBOARD END_EVENT_TABLE() MyFrame::MyFrame() - : wxFrame( (wxFrame *)NULL, -1, "wxImage sample", + : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"), wxPoint(20,20), wxSize(470,360) ) { - wxMenu *file_menu = new wxMenu(); - 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(); - menu_bar->Append(file_menu, "&File"); + + wxMenu *menuImage = new wxMenu; + menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O")); + +#ifdef wxHAVE_RAW_BITMAP + menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R")); +#endif + menuImage->AppendSeparator(); + menuImage->Append( ID_ABOUT, _T("&About...")); + menuImage->AppendSeparator(); + menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q")); + menu_bar->Append(menuImage, _T("&Image")); + +#if wxUSE_CLIPBOARD + wxMenu *menuClipboard = new wxMenu; + menuClipboard->Append(wxID_COPY, _T("&Copy test image\tCtrl-C")); + menuClipboard->Append(wxID_PASTE, _T("&Paste image\tCtrl-V")); + menu_bar->Append(menuClipboard, _T("&Clipboard")); +#endif // wxUSE_CLIPBOARD SetMenuBar( menu_bar ); @@ -592,8 +889,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) ) @@ -603,9 +900,9 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { - (void)wxMessageBox( "wxImage demo\n" - "Robert Roebling (c) 1998,2000", - "About wxImage Demo", wxICON_INFORMATION | wxOK ); + (void)wxMessageBox( _T("wxImage demo\n") + _T("Robert Roebling (c) 1998,2000"), + _T("About wxImage Demo"), wxICON_INFORMATION | wxOK ); } void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) @@ -622,9 +919,53 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) return; } - (new MyImageFrame(this, image.ConvertToBitmap()))->Show(); + (new MyImageFrame(this, wxBitmap(image)))->Show(); +} + +#ifdef wxHAVE_RAW_BITMAP + +void MyFrame::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) ) +{ + (new MyRawBitmapFrame(this))->Show(); +} + +#endif // wxHAVE_RAW_BITMAP + +#if wxUSE_CLIPBOARD + +void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event)) +{ + wxBitmapDataObject *dobjBmp = new wxBitmapDataObject; + dobjBmp->SetBitmap(*m_canvas->my_horse_png); + + wxTheClipboard->Open(); + + if ( !wxTheClipboard->SetData(dobjBmp) ) + { + wxLogError(_T("Failed to copy bitmap to clipboard")); + } + + wxTheClipboard->Close(); +} + +void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event)) +{ + wxBitmapDataObject dobjBmp; + + wxTheClipboard->Open(); + if ( !wxTheClipboard->GetData(dobjBmp) ) + { + wxLogMessage(_T("No bitmap data in the clipboard")); + } + else + { + (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show(); + } + wxTheClipboard->Close(); } +#endif // wxUSE_CLIPBOARD + //----------------------------------------------------------------------------- // MyApp //----------------------------------------------------------------------------- @@ -659,6 +1000,12 @@ bool MyApp::OnInit() wxImage::AddHandler( new wxXPMHandler ); #endif +#if wxUSE_ICO_CUR + wxImage::AddHandler( new wxICOHandler ); + wxImage::AddHandler( new wxCURHandler ); + wxImage::AddHandler( new wxANIHandler ); +#endif + wxFrame *frame = new MyFrame(); frame->Show( TRUE );