#endif
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+ #include "wx/wx.h"
#endif
#include "wx/image.h"
class MyCanvas: public wxScrolledWindow
{
public:
- MyCanvas() {}
MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
~MyCanvas();
void OnPaint( wxPaintEvent &event );
void CreateAntiAliasedBitmap();
- wxBitmap *my_horse_png;
- 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;
-
- wxBitmap *my_horse_asciigrey_pnm;
- wxBitmap *my_horse_rawgrey_pnm;
-
- wxBitmap *colorized_horse_jpeg;
+ wxBitmap my_horse_png;
+ 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_smile_xbm;
+ wxBitmap my_square;
+ wxBitmap my_anti;
+
+ wxBitmap my_horse_asciigrey_pnm;
+ wxBitmap my_horse_rawgrey_pnm;
+
+ wxBitmap colorized_horse_jpeg;
+ wxBitmap my_cmyk_jpeg;
+
+ wxBitmap my_toucan;
+ wxBitmap my_toucan_flipped_horiz;
+ wxBitmap my_toucan_flipped_vert;
+ wxBitmap my_toucan_flipped_both;
+ wxBitmap my_toucan_grey;
+ wxBitmap my_toucan_head;
int xH, yH ;
- int m_ani_images ;
+ int m_ani_images;
+ wxBitmap *my_horse_ani;
-protected:
+private:
wxBitmap m_bmpSmileXpm;
wxIcon m_iconSmileXpm;
-private:
- DECLARE_DYNAMIC_CLASS(MyCanvas)
DECLARE_EVENT_TABLE()
};
void OnSave(wxMouseEvent& WXUNUSED(event))
{
+#if wxUSE_FILEDLG
wxImage image = m_bitmap.ConvertToImage();
wxString savefilename = wxFileSelector( wxT("Save Image"),
- wxT(""),
- wxT(""),
+ wxEmptyString,
+ wxEmptyString,
(const wxChar *)NULL,
wxT("BMP files (*.bmp)|*.bmp|")
wxT("PNG files (*.png)|*.png|")
wxT("PCX files (*.pcx)|*.pcx|")
wxT("ICO files (*.ico)|*.ico|")
wxT("CUR files (*.cur)|*.cur"),
- wxSAVE,
+ wxFD_SAVE,
this);
if ( savefilename.empty() )
// (it may fail if the extension is not recognized):
image.SaveFile(savefilename);
}
+#endif // wxUSE_FILEDLG
}
private:
// another possibility: wxNativePixelData (don't forget to remove code
// setting alpha in the loop below then)
typedef wxAlphaPixelData Data;
+ // typedef wxNativePixelData Data;
- Data data(m_bitmap, wxPoint(BORDER, BORDER), wxSize(REAL_SIZE, REAL_SIZE));
+ // First, clear the whole bitmap by making it alpha
+ {
+ Data data( m_bitmap, wxPoint(0,0), wxSize(SIZE, 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 < SIZE; ++y )
+ {
+ Data::Iterator rowStart = p;
+ for ( int x = 0; x < SIZE; ++x )
+ {
+ p.Alpha() = 0;
+ ++p; // same as p.OffsetX(1)
+ }
+ p = rowStart;
+ p.OffsetY(data, 1);
+ }
+ }
+
+ // Then, draw colourful alpha-blended stripes
+ Data data(m_bitmap, wxPoint(BORDER, BORDER) , wxSize(REAL_SIZE, REAL_SIZE));
if ( !data )
{
wxLogError(_T("Failed to gain raw access to bitmap data"));
// MyCanvas
-IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
-
BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
EVT_PAINT(MyImageFrame::OnPaint)
, m_bmpSmileXpm((const char **) smile_xpm)
, m_iconSmileXpm((const char **) smile_xpm)
{
- my_horse_png = (wxBitmap*) NULL;
- 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;
- colorized_horse_jpeg = (wxBitmap*) NULL;
-
- my_smile_xbm = (wxBitmap*) NULL;
- my_square = (wxBitmap*) NULL;
- my_anti = (wxBitmap*) NULL;
-
- my_horse_asciigrey_pnm = (wxBitmap*) NULL;
- my_horse_rawgrey_pnm = (wxBitmap*) NULL;
-
+ my_horse_ani = NULL;
m_ani_images = 0 ;
SetBackgroundColour(* wxWHITE);
image.Destroy();
if ( image.LoadFile( dir + _T("test.png") ) )
- my_square = new wxBitmap( image );
+ my_square = wxBitmap( image );
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.png")) )
wxLogError(wxT("Can't load PNG image"));
else
- my_horse_png = new wxBitmap( image );
+ my_horse_png = wxBitmap( image );
+
+ if ( !image.LoadFile( dir + _T("toucan.png")) )
+ wxLogError(wxT("Can't load PNG image"));
+ else
+ my_toucan = wxBitmap(image);
+
+ my_toucan_flipped_horiz = wxBitmap(image.Mirror(true));
+ my_toucan_flipped_vert = wxBitmap(image.Mirror(false));
+ my_toucan_flipped_both = wxBitmap(image.Mirror(true).Mirror(false));
+ my_toucan_grey = wxBitmap(image.ConvertToGreyscale());
+ my_toucan_head = wxBitmap(image.GetSubImage(wxRect(40, 7, 80, 60)));
+
#endif // wxUSE_LIBPNG
#if wxUSE_LIBJPEG
wxLogError(wxT("Can't load JPG image"));
else
{
- my_horse_jpeg = new wxBitmap( image );
+ my_horse_jpeg = wxBitmap( image );
+
// Colorize by rotating green hue to red
wxImage::HSVValue greenHSV = wxImage::RGBtoHSV(wxImage::RGBValue(0, 255, 0));
wxImage::HSVValue redHSV = wxImage::RGBtoHSV(wxImage::RGBValue(255, 0, 0));
image.RotateHue(redHSV.hue - greenHSV.hue);
- colorized_horse_jpeg = new wxBitmap( image );
+ colorized_horse_jpeg = wxBitmap( image );
}
+
+ if ( !image.LoadFile( dir + _T("cmyk.jpg")) )
+ wxLogError(_T("Can't load CMYK JPG image"));
+ else
+ my_cmyk_jpeg = wxBitmap(image);
#endif // wxUSE_LIBJPEG
#if wxUSE_GIF
if ( !image.LoadFile( dir + _T("horse.gif" )) )
wxLogError(wxT("Can't load GIF image"));
else
- my_horse_gif = new wxBitmap( image );
+ my_horse_gif = wxBitmap( image );
#endif
#if wxUSE_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 );
+ my_horse_pcx = wxBitmap( image );
#endif
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
wxLogError(wxT("Can't load BMP image"));
else
- my_horse_bmp = new wxBitmap( image );
+ my_horse_bmp = wxBitmap( image );
#if wxUSE_XPM
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
wxLogError(wxT("Can't load XPM image"));
else
- my_horse_xpm = new wxBitmap( image );
+ my_horse_xpm = wxBitmap( image );
if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM ))
wxLogError(wxT("Can't save file"));
if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
wxLogError(wxT("Can't load PNM image"));
else
- my_horse_pnm = new wxBitmap( image );
+ my_horse_pnm = wxBitmap( image );
image.Destroy();
if ( !image.LoadFile( dir + _T("horse_ag.pnm"), wxBITMAP_TYPE_PNM ) )
wxLogError(wxT("Can't load PNM image"));
else
- my_horse_asciigrey_pnm = new wxBitmap( image );
+ my_horse_asciigrey_pnm = wxBitmap( image );
image.Destroy();
if ( !image.LoadFile( dir + _T("horse_rg.pnm"), wxBITMAP_TYPE_PNM ) )
wxLogError(wxT("Can't load PNM image"));
else
- my_horse_rawgrey_pnm = new wxBitmap( image );
+ my_horse_rawgrey_pnm = wxBitmap( image );
#endif
#if wxUSE_LIBTIFF
if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
wxLogError(wxT("Can't load TIFF image"));
else
- my_horse_tiff = new wxBitmap( image );
+ my_horse_tiff = wxBitmap( image );
#endif
CreateAntiAliasedBitmap();
- my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
+ my_smile_xbm = wxBitmap( (const char*)smile_bits, smile_width,
smile_height, 1 );
// demonstrates XPM automatically using the mask when saving
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 );
+ my_horse_ico32 = 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 );
+ my_horse_ico16 = 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 );
+ my_horse_ico = wxBitmap( image );
image.Destroy();
wxLogError(wxT("Can't load best ICO image"));
else
{
- my_horse_cur = new wxBitmap( image );
+ my_horse_cur = wxBitmap( image );
xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
}
if ( !image.LoadFile(mis) )
wxLogError(wxT("Can't load BMP image from stream"));
else
- my_horse_bmp2 = new wxBitmap( image );
+ my_horse_bmp2 = wxBitmap( image );
}
free(data);
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_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;
- delete my_horse_asciigrey_pnm;
- delete my_horse_rawgrey_pnm;
- delete colorized_horse_jpeg;
}
void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
PrepareDC( dc );
dc.DrawText( _T("Loaded image"), 30, 10 );
- if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
+ if (my_square.Ok())
+ dc.DrawBitmap( my_square, 30, 30 );
dc.DrawText( _T("Drawn directly"), 150, 10 );
dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
dc.SetBrush( *wxWHITE_BRUSH );
dc.DrawRectangle( 170, 50, 60, 60 );
- if (my_anti && my_anti->Ok())
- dc.DrawBitmap( *my_anti, 280, 30 );
+ if (my_anti.Ok())
+ dc.DrawBitmap( my_anti, 280, 30 );
dc.DrawText( _T("PNG handler"), 30, 135 );
- if (my_horse_png && my_horse_png->Ok())
+ if (my_horse_png.Ok())
{
- dc.DrawBitmap( *my_horse_png, 30, 150 );
+ dc.DrawBitmap( my_horse_png, 30, 150 );
wxRect rect(0,0,100,100);
- wxBitmap sub( my_horse_png->GetSubBitmap(rect) );
- dc.DrawText( _T("GetSubBitmap()"), 280, 190 );
- dc.DrawBitmap( sub, 280, 210 );
+ wxBitmap sub( my_horse_png.GetSubBitmap(rect) );
+ dc.DrawText( _T("GetSubBitmap()"), 280, 175 );
+ dc.DrawBitmap( sub, 280, 195 );
}
dc.DrawText( _T("JPEG handler"), 30, 365 );
- if (my_horse_jpeg && my_horse_jpeg->Ok())
- dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
+ if (my_horse_jpeg.Ok())
+ dc.DrawBitmap( my_horse_jpeg, 30, 380 );
+
+ dc.DrawText( _T("Green rotated to red"), 280, 365 );
+ if (colorized_horse_jpeg.Ok())
+ dc.DrawBitmap( colorized_horse_jpeg, 280, 380 );
+
+ dc.DrawText( _T("CMYK JPEG image"), 530, 365 );
+ if (my_cmyk_jpeg.Ok())
+ dc.DrawBitmap( my_cmyk_jpeg, 530, 380 );
dc.DrawText( _T("GIF handler"), 30, 595 );
- if (my_horse_gif && my_horse_gif->Ok())
- dc.DrawBitmap( *my_horse_gif, 30, 610 );
+ if (my_horse_gif.Ok())
+ dc.DrawBitmap( my_horse_gif, 30, 610 );
dc.DrawText( _T("PCX handler"), 30, 825 );
- if (my_horse_pcx && my_horse_pcx->Ok())
- dc.DrawBitmap( *my_horse_pcx, 30, 840 );
+ if (my_horse_pcx.Ok())
+ dc.DrawBitmap( my_horse_pcx, 30, 840 );
dc.DrawText( _T("BMP handler"), 30, 1055 );
- if (my_horse_bmp && my_horse_bmp->Ok())
- dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
+ if (my_horse_bmp.Ok())
+ dc.DrawBitmap( my_horse_bmp, 30, 1070 );
dc.DrawText( _T("BMP read from memory"), 280, 1055 );
- if (my_horse_bmp2 && my_horse_bmp2->Ok())
- dc.DrawBitmap( *my_horse_bmp2, 280, 1070 );
+ if (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 );
+ if (my_horse_pnm.Ok())
+ dc.DrawBitmap( my_horse_pnm, 30, 1300 );
dc.DrawText( _T("PNM handler (ascii grey)"), 280, 1285 );
- if (my_horse_asciigrey_pnm && my_horse_asciigrey_pnm->Ok())
- dc.DrawBitmap( *my_horse_asciigrey_pnm, 280, 1300 );
+ if (my_horse_asciigrey_pnm.Ok())
+ dc.DrawBitmap( my_horse_asciigrey_pnm, 280, 1300 );
dc.DrawText( _T("PNM handler (raw grey)"), 530, 1285 );
- if (my_horse_rawgrey_pnm && my_horse_rawgrey_pnm->Ok())
- dc.DrawBitmap( *my_horse_rawgrey_pnm, 530, 1300 );
+ if (my_horse_rawgrey_pnm.Ok())
+ dc.DrawBitmap( my_horse_rawgrey_pnm, 530, 1300 );
dc.DrawText( _T("TIFF handler"), 30, 1515 );
- if (my_horse_tiff && my_horse_tiff->Ok())
- dc.DrawBitmap( *my_horse_tiff, 30, 1530 );
+ if (my_horse_tiff.Ok())
+ dc.DrawBitmap( my_horse_tiff, 30, 1530 );
dc.DrawText( _T("XPM handler"), 30, 1745 );
- if (my_horse_xpm && my_horse_xpm->Ok())
- dc.DrawBitmap( *my_horse_xpm, 30, 1760 );
+ if (my_horse_xpm.Ok())
+ dc.DrawBitmap( my_horse_xpm, 30, 1760 );
+ // toucans
+ {
+ int x = 750, y = 10, yy = 170;
+
+ dc.DrawText(wxT("Original toucan"), x+50, y);
+ dc.DrawBitmap(my_toucan, x, y+15);
+ y += yy;
+ dc.DrawText(wxT("Flipped horizontally"), x+50, y);
+ dc.DrawBitmap(my_toucan_flipped_horiz, x, y+15);
+ y += yy;
+ dc.DrawText(wxT("Flipped vertically"), x+50, y);
+ dc.DrawBitmap(my_toucan_flipped_vert, x, y+15);
+ y += yy;
+ dc.DrawText(wxT("Flipped both h&v"), x+50, y);
+ dc.DrawBitmap(my_toucan_flipped_both, x, y+15);
+
+ y += yy;
+ dc.DrawText(wxT("In greyscale"), x+50, y);
+ dc.DrawBitmap(my_toucan_grey, x, y+15);
+
+ y += yy;
+ dc.DrawText(wxT("Toucan's head"), x+50, y);
+ dc.DrawBitmap(my_toucan_head, x, y+15);
+ }
- if (my_smile_xbm && my_smile_xbm->Ok())
+ if (my_smile_xbm.Ok())
{
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.DrawBitmap( my_smile_xbm, 30, 2010 );
- dc.SetTextForeground( wxT("BLACK") );
+ dc.SetTextForeground( *wxBLACK );
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();
+ 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( wxBitmap(i), 150, 2010, true );
- dc.SetTextForeground( wxT("BLACK") );
+ dc.SetTextForeground( *wxBLACK );
}
dc.SetTextBackground( wxT("GREEN") );
dc.DrawBitmap( mono, 30, 2130 );
- dc.SetTextForeground( wxT("BLACK") );
+ dc.SetTextForeground( *wxBLACK );
dc.DrawText( _T("After wxImage conversion"), 150, 2095 );
dc.DrawText( _T("(red on white)"), 150, 2110 );
dc.SetTextForeground( wxT("RED") );
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
dc.DrawBitmap( wxBitmap(i), 150, 2130, true );
- dc.SetTextForeground( wxT("BLACK") );
+ dc.SetTextForeground( *wxBLACK );
}
// For testing transparency
}
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 );
+ if (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 );
+ if (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 );
+ if (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())
+ if (my_horse_cur.Ok())
{
- dc.DrawBitmap( *my_horse_cur, 30, 2420, true );
+ 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 ++)
+ for ( int 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 );
}
-#if wxUSE_LIBJPEG
- if (colorized_horse_jpeg)
- {
- dc.DrawText( _T("Colorize image by rotating green hue to red"), 30, 2490 );
- dc.DrawBitmap( *colorized_horse_jpeg, 30, 2520 );
}
-#endif // wxUSE_LIBJPEG
-
}
void MyCanvas::CreateAntiAliasedBitmap()
dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
dc.SetTextForeground( wxT("RED") );
- dc.DrawText( _T("This is anti-aliased Text."), 20, 20 );
- dc.DrawText( _T("And a Rectangle."), 20, 60 );
+ dc.DrawText( _T("This is anti-aliased Text."), 20, 5 );
+ dc.DrawText( _T("And a Rectangle."), 20, 45 );
dc.SetBrush( *wxRED_BRUSH );
dc.SetPen( *wxTRANSPARENT_PEN );
- dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
+ dc.DrawRoundedRectangle( 20, 85, 200, 180, 20 );
wxImage original= bitmap.ConvertToImage();
wxImage anti( 150, 150 );
blue = blue/4;
anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue );
}
- my_anti = new wxBitmap(anti);
+ my_anti = wxBitmap(anti);
}
// MyFrame
MyFrame::MyFrame()
: wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
- wxPoint(20,20), wxSize(470,360) )
+ wxPoint(20, 20), wxSize(950, 700) )
{
wxMenuBar *menu_bar = new wxMenuBar();
void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
{
+#if wxUSE_FILEDLG
wxString filename = wxFileSelector(_T("Select image file"));
if ( !filename )
return;
}
(new MyImageFrame(this, wxBitmap(image)))->Show();
+#endif // wxUSE_FILEDLG
}
#ifdef wxHAVE_RAW_BITMAP
void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
{
wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
- dobjBmp->SetBitmap(*m_canvas->my_horse_png);
+ dobjBmp->SetBitmap(m_canvas->my_horse_png);
wxTheClipboard->Open();
return true;
}
-
projects / wxWidgets.git / blobdiff