Corrected check for new mingw32 with new headers

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

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 677baca7c1d1f627fac0d79c30b8e479358a6921..8107e5e22ce8afbcdf3c6fbad13756700289163f 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include "wx/image.h"
+#include "wx/listctrl.h"
 
 // derived classes
 
@@ -77,14 +78,8 @@ END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
-        : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
+        : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER | wxTAB_TRAVERSAL )
 {
-  (void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
-  
-  (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );
-  
-  (void) new wxCheckBox( this, -1, "Disable", wxPoint(10,90) );
-  
     wxString choices[] =
     {
         "This",
@@ -94,9 +89,36 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         "examples."
     };
   
+  (void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
+  
+  (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );
+  
+  (void) new wxRadioButton( this, -1, "Disable", wxPoint(10,90) );
+  
   (void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices );
   
-  (void) new wxRadioBox( this, -1, "This", wxPoint(10,200), wxDefaultSize, 5, choices );
+  (void) new wxRadioBox( this, -1, "This", wxPoint(10,200), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_COLS );
+
+  (void) new wxRadioBox( this, -1, "This", wxPoint(10,300), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_ROWS );
+
+  wxListCtrl *m_listCtrl = new wxListCtrl(
+       this, -1, wxPoint(200, 10), wxSize(180, 120),
+       wxLC_REPORT | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+
+  m_listCtrl->InsertColumn(0, "First", wxLIST_FORMAT_LEFT, 90);
+  m_listCtrl->InsertColumn(1, "Last", wxLIST_FORMAT_LEFT, 90);
+
+  for ( int i=0; i < 30; i++)
+  {
+      char buf[20];
+      sprintf(buf, "Item %d", i);
+      m_listCtrl->InsertItem(i, buf);
+  }
+  m_listCtrl->SetItemState( 3, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+
+  (void) new wxListBox( this, -1, wxPoint(200,180), wxSize(180,120), 5, choices, wxLB_ALWAYS_SB );
+  
+  SetBackgroundColour( "WHEAT" );
 }
 
 MyCanvas::~MyCanvas()
@@ -108,7 +130,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
   wxPaintDC dc( this );
   PrepareDC( dc );
 
-  dc.DrawText( "Some text", 10, 10 );
+  dc.DrawText( "Some text", 110, 10 );
   
   dc.DrawRectangle( 50, 30, 200, 200 );
 }