corrected (?) wxStringList::Delete()

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index fbf35ab0e265b84443c37b72e9e16f8e31e8a7c7..4e5146080765cc598395abcd8947c0bd2c1e11dd 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -122,14 +122,15 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
 // MyFrame
 
 
 // MyFrame
 

-const  ID_QUIT  = 108;
-const  ID_ABOUT = 109;
+const int ID_QUIT  = 108;
+const int ID_ABOUT = 109;

 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 BEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
   EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 BEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
   EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)

+  EVT_SIZE    (MyFrame::OnSize)

 END_EVENT_TABLE()
 
 MyFrame::MyFrame(void) :
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(void) :


@@ -149,7 +150,7 @@ MyFrame::MyFrame(void) :
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );
   
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );
   

-  m_canvas = new MyCanvas( this, -1, wxPoint(2,62), wxSize(300-4,120-4) );
+  m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );

   m_canvas->SetScrollbars( 10, 10, 50, 50 );
 }
 
   m_canvas->SetScrollbars( 10, 10, 50, 50 );
 }
 


@@ -163,6 +164,13 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
   (void) wxMessageBox( "wxImage demo\nRobert Roebling (c) 1998", "About wxImage Demo", wxOK );
 }
 
   (void) wxMessageBox( "wxImage demo\nRobert Roebling (c) 1998", "About wxImage Demo", wxOK );
 }
 

+void MyFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
+{
+  int w,h;
+  GetClientSize( &w, &h );
+  m_canvas->SetSize( w, h );
+}
+

 //-----------------------------------------------------------------------------
 // MyApp
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // MyApp
 //-----------------------------------------------------------------------------