Ignore failure when deleting something that might not exist

[wxWidgets.git] / samples / image / image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 56c4b6ddc793cc313d58ef2ac81d0a32f1e3ba8e..7b17838bd525c529a2afa16b04103564669444ed 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -80,10 +80,14 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()
 
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()
 

-MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id,
+MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,

                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
 {
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
 {

+  my_horse = (wxBitmap*) NULL;
+  my_square = (wxBitmap*) NULL;
+  my_anti = (wxBitmap*) NULL;
+

   SetBackgroundColour(* wxWHITE);
 
   wxBitmap bitmap( 100, 100 );
   SetBackgroundColour(* wxWHITE);
 
   wxBitmap bitmap( 100, 100 );


@@ -109,7 +113,7 @@ MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id,
   
   image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
   my_square = new wxBitmap( image.ConvertToBitmap() );
   
   image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
   my_square = new wxBitmap( image.ConvertToBitmap() );

-  
+

   CreateAntiAliasedBitmap();
 }
 
   CreateAntiAliasedBitmap();
 }
 


@@ -126,26 +130,26 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
   PrepareDC( dc );
 
   dc.DrawText( "Loaded image", 30, 10 );
   PrepareDC( dc );
 
   dc.DrawText( "Loaded image", 30, 10 );

-  if (my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
+  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 );
 
 
   dc.DrawText( "Drawn directly", 150, 10 );
   dc.SetBrush( wxBrush( "orange", wxSOLID ) );
   dc.SetPen( *wxWHITE_PEN );
   dc.DrawRectangle( 150, 30, 100, 100 );
 

-  if (my_horse->Ok()) dc.DrawBitmap( *my_horse, 30, 140 );
+  if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 );

   
   

-  if (my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 );
+  if (my_horse && my_horse->Ok()) dc.DrawBitmap( *my_horse, 30, 140 );

 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
 {
   wxBitmap bitmap( 300, 300 );
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
 {
   wxBitmap bitmap( 300, 300 );

+

   wxMemoryDC dc;
   wxMemoryDC dc;

+

   dc.SelectObject( bitmap );
   dc.SelectObject( bitmap );

-  
-  dc.SetPen( *wxTRANSPARENT_PEN );
-  
+

   dc.Clear();
   
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxDEFAULT, wxDEFAULT ) );
   dc.Clear();
   
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxDEFAULT, wxDEFAULT ) );


@@ -158,7 +162,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
   
   wxImage original( bitmap );
   wxImage anti( 150, 150 );
   
   wxImage original( bitmap );
   wxImage anti( 150, 150 );

-  
+

   /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
   
   for (int y = 1; y < 149; y++)
   /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
   
   for (int y = 1; y < 149; y++)


@@ -237,8 +241,6 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

-  wxImage::AddHandler( new wxPNGHandler );
-

   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );
 
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );