Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 54c6dfbbbceed09965231ebf0b78b761136706f7..d9f5cfc0415be27d41c45c88e4208fb824683e32 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -74,6 +74,8 @@ public:
     
     void OnPaint( wxPaintEvent &event );
     void OnEraseBackground( wxEraseEvent &event );
     
     void OnPaint( wxPaintEvent &event );
     void OnEraseBackground( wxEraseEvent &event );

+    
+    wxBitmap    m_bitmap;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -174,24 +176,46 @@ MyCanvas::MyCanvas( MyFrame *parent )
                     wxScrolledWindowStyle|wxNO_FULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER )
 {
     SetScrollbars( 10, 10, 40, 100, 0, 0 );
                     wxScrolledWindowStyle|wxNO_FULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER )
 {
     SetScrollbars( 10, 10, 40, 100, 0, 0 );

+    
+    m_bitmap = wxBitmap( mondrian_xpm );
+    
+    new wxStaticBitmap( this, -1, m_bitmap, wxPoint(80,20) );

 }
 
 void MyCanvas::OnPaint( wxPaintEvent &event )
 {
     wxPaintDC dc(this);
     PrepareDC( dc );
 }
 
 void MyCanvas::OnPaint( wxPaintEvent &event )
 {
     wxPaintDC dc(this);
     PrepareDC( dc );

-        
+    
+    dc.SetBrush( *wxBLACK_BRUSH );
+    dc.DrawRectangle( 0,0,200,50 );
+    
+    dc.DrawBitmap( m_bitmap, 10, 20, TRUE );
+    
+#if 0  

     wxRegionIterator upd( GetUpdateRegion() );
     while (upd)
     {
         wxLogDebug( "Paint: %d %d %d %d", upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
         upd ++;
     }
     wxRegionIterator upd( GetUpdateRegion() );
     while (upd)
     {
         wxLogDebug( "Paint: %d %d %d %d", upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
         upd ++;
     }

-    
+#endif
+
+#if 0
+    wxSize size = GetSize();
+    wxSize client_size = GetClientSize();
+    wxLogDebug( "size %d %d client_size %d %d", size.x, size.y, client_size.x, client_size.y );
+#endif
+
+    int i;

     dc.SetPen( *wxWHITE_PEN );
     dc.SetPen( *wxWHITE_PEN );

-    for (int i = 0; i < 20; i += 2)
+    for (i = 0; i < 20; i += 2)

        dc.DrawLine( i,i, i+100,i );
     
        dc.DrawLine( i,i, i+100,i );
     

+    dc.SetPen( *wxWHITE_PEN );
+    for (i = 200; i < 220; i += 2)
+       dc.DrawLine( i-200,i, i-100,i );
+    

     wxRegion region( 110, 110, 80, 80 );
     wxRegion hole( 130, 130, 40, 1 );
     region.Intersect( hole );
     wxRegion region( 110, 110, 80, 80 );
     wxRegion hole( 130, 130, 40, 1 );
     region.Intersect( hole );