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 901197db71ef49ae496d4744eab80160091a6c4f..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
 
@@ -96,9 +97,28 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
   
   (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( *wxWHITE );
+  SetBackgroundColour( "WHEAT" );
 }
 
 MyCanvas::~MyCanvas()
@@ -107,12 +127,10 @@ MyCanvas::~MyCanvas()
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
-  return;
-
   wxPaintDC dc( this );
   PrepareDC( dc );
 
-  dc.DrawText( "Some text", 10, 10 );
+  dc.DrawText( "Some text", 110, 10 );
   
   dc.DrawRectangle( 50, 30, 200, 200 );
 }
@@ -133,7 +151,6 @@ MyFrame::MyFrame()
        : wxFrame( (wxFrame *)NULL, -1, "wxScrolledWindow sample",
                   wxPoint(20,20), wxSize(470,360) )
 {
-/*
   wxMenu *file_menu = new wxMenu();
   file_menu->Append( ID_ABOUT, "&About..");
   file_menu->Append( ID_QUIT, "E&xit\tAlt-X");
@@ -147,7 +164,6 @@ MyFrame::MyFrame()
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );
 
-*/
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
   m_canvas->SetScrollbars( 10, 10, 50, 100 );
 }