New wxDataObject, DnD and Clipboard code
A few more minor fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -77,8 +77,6 @@ END_EVENT_TABLE()
|
||||
MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, const wxPoint &pos, const wxSize &size )
|
||||
: wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
|
||||
{
|
||||
wxImage image;
|
||||
|
||||
wxBitmap bitmap( 100, 100 );
|
||||
|
||||
wxMemoryDC dc;
|
||||
@@ -88,14 +86,14 @@ MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, const wxPoint &pos, c
|
||||
dc.DrawRectangle( 0, 0, 100, 100 );
|
||||
dc.SelectObject( wxNullBitmap );
|
||||
|
||||
image = bitmap.ConvertToImage();
|
||||
wxImage image( bitmap );
|
||||
image.SaveFile( "../test.png", wxBITMAP_TYPE_PNG );
|
||||
|
||||
image.LoadFile( "../horse.png", wxBITMAP_TYPE_PNG );
|
||||
my_horse = new wxBitmap( image );
|
||||
my_horse = new wxBitmap( image.ConvertToBitmap() );
|
||||
|
||||
image.LoadFile( "../test.png", wxBITMAP_TYPE_PNG );
|
||||
my_square = new wxBitmap( image );
|
||||
my_square = new wxBitmap( image.ConvertToBitmap() );
|
||||
}
|
||||
|
||||
MyCanvas::~MyCanvas(void)
|
||||
|
Reference in New Issue
Block a user