]> git.saurik.com Git - wxWidgets.git/blobdiff - samples/newgrid/griddemo.cpp
fixed listbox initial size determination
[wxWidgets.git] / samples / newgrid / griddemo.cpp
index bf87cffbbfafd8e3405241aecc7d1476b6966fc4..e78e342be9a6107e299fcff95f876471cfc08449 100644 (file)
@@ -1,11 +1,24 @@
-// griddemo.cpp
-//
-//  grid test program
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        griddemo.cpp
+// Purpose:     Grid control wxWindows sample
+// Author:      Michael Bedward
+// Modified by:
+// RCS-ID:      $Id$
+// Copyright:   (c) Michael Bedward, Julian Smart
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-#pragma implementation
-#pragma interface
+    #pragma implementation
+    #pragma interface
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/colordlg.h"
 
 #include "wx/grid.h"
+#include "wx/generic/gridctrl.h"
 
 #include "griddemo.h"
 
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
 IMPLEMENT_APP( GridApp )
 
+// ============================================================================
+// implementation
+// ============================================================================
 
+// ----------------------------------------------------------------------------
+// GridApp
+// ----------------------------------------------------------------------------
 
 bool GridApp::OnInit()
 {
     GridFrame *frame = new GridFrame;
     frame->Show( TRUE );
-    
+
     return TRUE;
 }
 
-
+// ----------------------------------------------------------------------------
+// GridFrame
+// ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_MENU( ID_TOGGLEROWLABELS,  GridFrame::ToggleRowLabels )
-    EVT_MENU( ID_TOGGLECOLLABELS,  GridFrame::ToggleColLabels )    
-    EVT_MENU( ID_TOGGLECONTROLPANEL, GridFrame::ToggleControlPanel )
-    EVT_MENU( ID_TOGGLECELLEDIT, GridFrame::ToggleCellEdit )
-    EVT_MENU( ID_SETLABELCOLOUR, GridFrame::SetLabelColour )    
-    EVT_MENU( ID_SETLABELTEXTCOLOUR, GridFrame::SetLabelTextColour )    
-    EVT_MENU( ID_ROWLABELHORIZALIGN, GridFrame::SetRowLabelHorizAlignment )    
-    EVT_MENU( ID_ROWLABELVERTALIGN, GridFrame::SetRowLabelVertAlignment )    
-    EVT_MENU( ID_COLLABELHORIZALIGN, GridFrame::SetColLabelHorizAlignment )    
-    EVT_MENU( ID_COLLABELVERTALIGN, GridFrame::SetColLabelVertAlignment )    
+    EVT_MENU( ID_TOGGLECOLLABELS,  GridFrame::ToggleColLabels )
+    EVT_MENU( ID_TOGGLEEDIT, GridFrame::ToggleEditing )
+    EVT_MENU( ID_TOGGLEROWSIZING, GridFrame::ToggleRowSizing )
+    EVT_MENU( ID_TOGGLECOLSIZING, GridFrame::ToggleColSizing )
+    EVT_MENU( ID_TOGGLEGRIDSIZING, GridFrame::ToggleGridSizing )
+    EVT_MENU( ID_TOGGLEGRIDLINES, GridFrame::ToggleGridLines )
+    EVT_MENU( ID_AUTOSIZECOLS, GridFrame::AutoSizeCols )
+    EVT_MENU( ID_SETLABELCOLOUR, GridFrame::SetLabelColour )
+    EVT_MENU( ID_SETLABELTEXTCOLOUR, GridFrame::SetLabelTextColour )
+    EVT_MENU( ID_ROWLABELHORIZALIGN, GridFrame::SetRowLabelHorizAlignment )
+    EVT_MENU( ID_ROWLABELVERTALIGN, GridFrame::SetRowLabelVertAlignment )
+    EVT_MENU( ID_COLLABELHORIZALIGN, GridFrame::SetColLabelHorizAlignment )
+    EVT_MENU( ID_COLLABELVERTALIGN, GridFrame::SetColLabelVertAlignment )
     EVT_MENU( ID_GRIDLINECOLOUR, GridFrame::SetGridLineColour )
+    EVT_MENU( ID_INSERTROW, GridFrame::InsertRow )
+    EVT_MENU( ID_INSERTCOL, GridFrame::InsertCol )
+    EVT_MENU( ID_DELETEROW, GridFrame::DeleteSelectedRows )
+    EVT_MENU( ID_DELETECOL, GridFrame::DeleteSelectedCols )
     EVT_MENU( ID_CLEARGRID, GridFrame::ClearGrid )
+    EVT_MENU( ID_SELCELLS,  GridFrame::SelectCells )
+    EVT_MENU( ID_SELROWS,  GridFrame::SelectRows )
+    EVT_MENU( ID_SELCOLS,  GridFrame::SelectCols )
+
+    EVT_MENU( ID_SET_CELL_FG_COLOUR, GridFrame::SetCellFgColour )
+    EVT_MENU( ID_SET_CELL_BG_COLOUR, GridFrame::SetCellBgColour )
+
     EVT_MENU( ID_ABOUT, GridFrame::About )
     EVT_MENU( wxID_EXIT, GridFrame::OnQuit )
-
-    EVT_WXGRID_LABEL_LEFT_CLICK( GridFrame::OnLabelLeftClick )
-    EVT_WXGRID_CELL_LEFT_CLICK( GridFrame::OnCellLeftClick )
-    EVT_WXGRID_ROW_SIZE( GridFrame::OnRowSize )
-    EVT_WXGRID_COL_SIZE( GridFrame::OnColSize )
-    EVT_WXGRID_RANGE_SELECT( GridFrame::OnRangeSelected )
-    EVT_WXGRID_CELL_CHANGE( GridFrame::OnCellValueChanged )
+    EVT_MENU( ID_VTABLE, GridFrame::OnVTable)
+    EVT_MENU( ID_BUGS_TABLE, GridFrame::OnBugsTable)
+
+    EVT_MENU( ID_DESELECT_CELL, GridFrame::DeselectCell)
+    EVT_MENU( ID_DESELECT_COL, GridFrame::DeselectCol)
+    EVT_MENU( ID_DESELECT_ROW, GridFrame::DeselectRow)
+    EVT_MENU( ID_DESELECT_ALL, GridFrame::DeselectAll)
+    EVT_MENU( ID_SELECT_CELL, GridFrame::SelectCell)
+    EVT_MENU( ID_SELECT_COL, GridFrame::SelectCol)
+    EVT_MENU( ID_SELECT_ROW, GridFrame::SelectRow)
+    EVT_MENU( ID_SELECT_ALL, GridFrame::SelectAll)
+    EVT_MENU( ID_SELECT_UNSELECT, GridFrame::OnAddToSelectToggle)
+
+    EVT_MENU( ID_SET_HIGHLIGHT_WIDTH, GridFrame::OnSetHighlightWidth)
+    EVT_MENU( ID_SET_RO_HIGHLIGHT_WIDTH, GridFrame::OnSetROHighlightWidth)
+
+    EVT_GRID_LABEL_LEFT_CLICK( GridFrame::OnLabelLeftClick )
+    EVT_GRID_CELL_LEFT_CLICK( GridFrame::OnCellLeftClick )
+    EVT_GRID_ROW_SIZE( GridFrame::OnRowSize )
+    EVT_GRID_COL_SIZE( GridFrame::OnColSize )
+    EVT_GRID_SELECT_CELL( GridFrame::OnSelectCell )
+    EVT_GRID_RANGE_SELECT( GridFrame::OnRangeSelected )
+    EVT_GRID_CELL_CHANGE( GridFrame::OnCellValueChanged )
+
+    EVT_GRID_EDITOR_SHOWN( GridFrame::OnEditorShown )
+    EVT_GRID_EDITOR_HIDDEN( GridFrame::OnEditorHidden )
 END_EVENT_TABLE()
 
-    
+
 GridFrame::GridFrame()
         : wxFrame( (wxFrame *)NULL, -1, "wxWindows grid class demo",
                    wxDefaultPosition,
                    wxDefaultSize )
 {
     int gridW = 600, gridH = 300;
-    int logW = gridW, logH = 80;
-    
+    int logW = gridW, logH = 100;
+
     wxMenu *fileMenu = new wxMenu;
-    fileMenu->Append( wxID_EXIT, "E&xit" );
-    
+    fileMenu->Append( ID_VTABLE, "&Virtual table test\tCtrl-V");
+    fileMenu->Append( ID_BUGS_TABLE, "&Bugs table test\tCtrl-B");
+    fileMenu->AppendSeparator();
+    fileMenu->Append( wxID_EXIT, "E&xit\tAlt-X" );
+
     wxMenu *viewMenu = new wxMenu;
     viewMenu->Append( ID_TOGGLEROWLABELS,  "&Row labels", "", TRUE );
     viewMenu->Append( ID_TOGGLECOLLABELS,  "&Col labels", "", TRUE );
-    viewMenu->Append( ID_TOGGLECONTROLPANEL,  "To&p controls", "", TRUE );
-    viewMenu->Append( ID_TOGGLECELLEDIT,  "&In-place editing", "", TRUE );
-    viewMenu->Append( ID_SETLABELCOLOUR, "Set &label colour" );
-    viewMenu->Append( ID_SETLABELTEXTCOLOUR, "Set label &text colour" );
-    
+    viewMenu->Append( ID_TOGGLEEDIT,  "&Editable", "", TRUE );
+    viewMenu->Append( ID_TOGGLEROWSIZING, "Ro&w drag-resize", "", TRUE );
+    viewMenu->Append( ID_TOGGLECOLSIZING, "C&ol drag-resize", "", TRUE );
+    viewMenu->Append( ID_TOGGLEGRIDSIZING, "&Grid drag-resize", "", TRUE );
+    viewMenu->Append( ID_TOGGLEGRIDLINES, "&Grid Lines", "", TRUE );
+    viewMenu->Append( ID_SET_HIGHLIGHT_WIDTH, "&Set Cell Highlight Width...", "" );
+    viewMenu->Append( ID_SET_RO_HIGHLIGHT_WIDTH, "&Set Cell RO Highlight Width...", "" );
+    viewMenu->Append( ID_AUTOSIZECOLS, "&Auto-size cols" );
+
     wxMenu *rowLabelMenu = new wxMenu;
 
     viewMenu->Append( ID_ROWLABELALIGN, "R&ow label alignment",
@@ -90,8 +157,8 @@ GridFrame::GridFrame()
                       "Change alignment of row labels" );
 
     rowLabelMenu->Append( ID_ROWLABELHORIZALIGN, "&Horizontal" );
-    rowLabelMenu->Append( ID_ROWLABELVERTALIGN, "&Vertical" );    
-    
+    rowLabelMenu->Append( ID_ROWLABELVERTALIGN, "&Vertical" );
+
     wxMenu *colLabelMenu = new wxMenu;
 
     viewMenu->Append( ID_COLLABELALIGN, "Col l&abel alignment",
@@ -101,68 +168,151 @@ GridFrame::GridFrame()
     colLabelMenu->Append( ID_COLLABELHORIZALIGN, "&Horizontal" );
     colLabelMenu->Append( ID_COLLABELVERTALIGN, "&Vertical" );
 
-    viewMenu->Append( ID_GRIDLINECOLOUR, "&Grid line colour" );
-    viewMenu->Append( ID_CLEARGRID, "Cl&ear grid cell contents" );
+    wxMenu *colMenu = new wxMenu;
+    colMenu->Append( ID_SETLABELCOLOUR, "Set &label colour" );
+    colMenu->Append( ID_SETLABELTEXTCOLOUR, "Set label &text colour" );
+    colMenu->Append( ID_GRIDLINECOLOUR, "&Grid line colour" );
+    colMenu->Append( ID_SET_CELL_FG_COLOUR, "Set cell &foreground colour" );
+    colMenu->Append( ID_SET_CELL_BG_COLOUR, "Set cell &background colour" );
+
+    wxMenu *editMenu = new wxMenu;
+    editMenu->Append( ID_INSERTROW, "Insert &row" );
+    editMenu->Append( ID_INSERTCOL, "Insert &column" );
+    editMenu->Append( ID_DELETEROW, "Delete selected ro&ws" );
+    editMenu->Append( ID_DELETECOL, "Delete selected co&ls" );
+    editMenu->Append( ID_CLEARGRID, "Cl&ear grid cell contents" );
+
+    wxMenu *selectMenu = new wxMenu;
+    selectMenu->Append( ID_SELECT_UNSELECT, "Add new cells to the selection",
+                        "When off, old selection is deselected before "
+                        "selecting the new cells", TRUE );
+    selectMenu->Append( ID_SELECT_ALL, "Select all");
+    selectMenu->Append( ID_SELECT_ROW, "Select row 2");
+    selectMenu->Append( ID_SELECT_COL, "Select col 2");
+    selectMenu->Append( ID_SELECT_CELL, "Select cell (3, 1)");
+    selectMenu->Append( ID_DESELECT_ALL, "Deselect all");
+    selectMenu->Append( ID_DESELECT_ROW, "Deselect row 2");
+    selectMenu->Append( ID_DESELECT_COL, "Deselect col 2");
+    selectMenu->Append( ID_DESELECT_CELL, "Deselect cell (3, 1)");
+    wxMenu *selectionMenu = new wxMenu;
+    selectMenu->Append( ID_CHANGESEL, "Change &selection mode",
+                      selectionMenu,
+                      "Change selection mode" );
+
+    selectionMenu->Append( ID_SELCELLS, "Select &Cells" );
+    selectionMenu->Append( ID_SELROWS, "Select &Rows" );
+    selectionMenu->Append( ID_SELCOLS, "Select C&ols" );
+
 
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append( ID_ABOUT, "&About wxGrid demo" );
-    
+
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append( fileMenu, "&File" );
     menuBar->Append( viewMenu, "&View" );
+    menuBar->Append( colMenu,  "&Colours" );
+    menuBar->Append( editMenu, "&Edit" );
+    menuBar->Append( selectMenu, "&Select" );
     menuBar->Append( helpMenu, "&Help" );
 
     SetMenuBar( menuBar );
 
+    m_addToSel = FALSE;
+
     grid = new wxGrid( this,
                        -1,
                        wxPoint( 0, 0 ),
                        wxSize( 400, 300 ) );
-            
+
     logWin = new wxTextCtrl( this,
                              -1,
                              wxEmptyString,
                              wxPoint( 0, gridH + 20 ),
                              wxSize( logW, logH ),
                              wxTE_MULTILINE );
-                             
+
     logger = new wxLogTextCtrl( logWin );
-    logger->SetActiveTarget( logger );
+    m_logOld = logger->SetActiveTarget( logger );
     logger->SetTimestamp( NULL );
 
     // this will create a grid and, by default, an associated grid
-    // table for string data
-    //
+    // table for strings
     grid->CreateGrid( 100, 100 );
 
-    grid->EnableTopEditControl( TRUE );
-    
     grid->SetRowSize( 0, 60 );
     grid->SetCellValue( 0, 0, "Ctrl+Home\nwill go to\nthis cell" );
+
+    grid->SetCellValue( 0, 1, "A long piece of text to demonstrate wrapping." );
+    grid->SetCellRenderer(0 , 1, new wxGridCellAutoWrapStringRenderer);
+    grid->SetCellEditor( 0,  1 , new wxGridCellAutoWrapStringEditor);
     
-    grid->SetCellValue( 0, 1, "Blah" );
     grid->SetCellValue( 0, 2, "Blah" );
+    grid->SetCellValue( 0, 3, "Read only" );
+    grid->SetReadOnly( 0, 3 );
+    
+    grid->SetCellValue( 0, 4, "Can veto edit this cell" );
 
     grid->SetCellValue( 0, 5, "Press\nCtrl+arrow\nto skip over\ncells" );
 
     grid->SetRowSize( 99, 60 );
     grid->SetCellValue( 99, 99, "Ctrl+End\nwill go to\nthis cell" );
-    
+
+    grid->SetCellValue(2, 2, "red");
+
+    grid->SetCellTextColour(2, 2, *wxRED);
+    grid->SetCellValue(3, 3, "green on grey");
+    grid->SetCellTextColour(3, 3, *wxGREEN);
+    grid->SetCellBackgroundColour(3, 3, *wxLIGHT_GREY);
+
+    grid->SetCellValue(4, 4, "a weird looking cell");
+    grid->SetCellAlignment(4, 4, wxALIGN_CENTRE, wxALIGN_CENTRE);
+    grid->SetCellRenderer(4, 4, new MyGridCellRenderer);
+
+    grid->SetCellValue(3, 0, "0");
+    grid->SetCellRenderer(3, 0, new wxGridCellBoolRenderer);
+    grid->SetCellEditor(3, 0, new wxGridCellBoolEditor);
+
+    wxGridCellAttr *attr;
+    attr = new wxGridCellAttr;
+    attr->SetTextColour(*wxBLUE);
+    grid->SetColAttr(5, attr);
+    attr = new wxGridCellAttr;
+    attr->SetBackgroundColour(*wxRED);
+    grid->SetRowAttr(5, attr);
+
+    grid->SetCellValue(2, 4, "a wider column");
+    grid->SetColSize(4, 120);
+    grid->SetColMinimalWidth(4, 120);
+
+    grid->SetCellTextColour(5, 8, *wxGREEN);
+    grid->SetCellValue(5, 8, "Bg from row attr\nText col from cell attr");
+    grid->SetCellValue(5, 5, "Bg from row attr\nText col from col attr");
+
+    grid->SetColFormatFloat(6);
+    grid->SetCellValue(0, 6, "3.1415");
+    grid->SetCellValue(1, 6, "1415");
+    grid->SetCellValue(2, 6, "12345.67890");
+
+    grid->SetColFormatFloat(7, 6, 2);
+    grid->SetCellValue(0, 7, "3.1415");
+    grid->SetCellValue(1, 7, "1415");
+    grid->SetCellValue(2, 7, "12345.67890");
+
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     topSizer->Add( grid,
                    1,
                    wxEXPAND );
-                   
+
     topSizer->Add( logWin,
-                   0, 
+                   0,
                    wxEXPAND );
-                   
+
     SetAutoLayout( TRUE );
     SetSizer( topSizer );
-    
+
     topSizer->Fit( this );
     topSizer->SetSizeHints( this );
-    
+
     Centre();
     SetDefaults();
 }
@@ -170,14 +320,19 @@ GridFrame::GridFrame()
 
 GridFrame::~GridFrame()
 {
+    delete wxLog::SetActiveTarget(m_logOld);
 }
 
+
 void GridFrame::SetDefaults()
 {
     GetMenuBar()->Check( ID_TOGGLEROWLABELS, TRUE );
     GetMenuBar()->Check( ID_TOGGLECOLLABELS, TRUE );
-    GetMenuBar()->Check( ID_TOGGLECONTROLPANEL, TRUE );
-    GetMenuBar()->Check( ID_TOGGLECELLEDIT, TRUE );
+    GetMenuBar()->Check( ID_TOGGLEEDIT, TRUE );
+    GetMenuBar()->Check( ID_TOGGLEROWSIZING, TRUE );
+    GetMenuBar()->Check( ID_TOGGLECOLSIZING, TRUE );
+    GetMenuBar()->Check( ID_TOGGLEGRIDSIZING, TRUE );
+    GetMenuBar()->Check( ID_TOGGLEGRIDLINES, TRUE );
 }
 
 
@@ -207,16 +362,73 @@ void GridFrame::ToggleColLabels( wxCommandEvent& WXUNUSED(ev) )
 }
 
 
-void GridFrame::ToggleControlPanel( wxCommandEvent& WXUNUSED(ev) )
+void GridFrame::ToggleEditing( wxCommandEvent& WXUNUSED(ev) )
 {
-    grid->EnableTopEditControl(GetMenuBar()->IsChecked(ID_TOGGLECONTROLPANEL));
+    grid->EnableEditing(
+        GetMenuBar()->IsChecked( ID_TOGGLEEDIT ) );
 }
 
 
-void GridFrame::ToggleCellEdit( wxCommandEvent& WXUNUSED(ev) )
+void GridFrame::ToggleRowSizing( wxCommandEvent& WXUNUSED(ev) )
 {
-    grid->EnableCellEditControl(
-        GetMenuBar()->IsChecked( ID_TOGGLECELLEDIT ) );
+    grid->EnableDragRowSize(
+        GetMenuBar()->IsChecked( ID_TOGGLEROWSIZING ) );
+}
+
+
+void GridFrame::ToggleColSizing( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->EnableDragColSize(
+        GetMenuBar()->IsChecked( ID_TOGGLECOLSIZING ) );
+}
+
+void GridFrame::ToggleGridSizing( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->EnableDragGridSize(
+        GetMenuBar()->IsChecked( ID_TOGGLEGRIDSIZING ) );
+}
+
+
+void GridFrame::ToggleGridLines( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->EnableGridLines(
+        GetMenuBar()->IsChecked( ID_TOGGLEGRIDLINES ) );
+}
+
+void GridFrame::OnSetHighlightWidth( wxCommandEvent& WXUNUSED(ev) )
+{
+    wxString choices[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"};
+
+    wxSingleChoiceDialog dlg(this, "Choose the thickness of the highlight pen:",
+                             "Pen Width", 11, choices);
+
+    int current = grid->GetCellHighlightPenWidth();
+    dlg.SetSelection(current);
+    if (dlg.ShowModal() == wxID_OK) {
+        grid->SetCellHighlightPenWidth(dlg.GetSelection());
+    }
+}
+
+void GridFrame::OnSetROHighlightWidth( wxCommandEvent& WXUNUSED(ev) )
+{
+    wxString choices[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"};
+
+    wxSingleChoiceDialog dlg(this, "Choose the thickness of the highlight pen:",
+                             "Pen Width", 11, choices);
+
+    int current = grid->GetCellHighlightROPenWidth();
+    dlg.SetSelection(current);
+    if (dlg.ShowModal() == wxID_OK) {
+        grid->SetCellHighlightROPenWidth(dlg.GetSelection());
+    }
+}
+
+
+
+void GridFrame::AutoSizeCols( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->AutoSizeColumns();
+    grid->Refresh();
 }
 
 
@@ -252,19 +464,19 @@ void GridFrame::SetRowLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) )
 {
     int horiz, vert;
     grid->GetRowLabelAlignment( &horiz, &vert );
-    
+
     switch ( horiz )
     {
-        case wxLEFT:
-            horiz = wxCENTRE;
+        case wxALIGN_LEFT:
+            horiz = wxALIGN_CENTRE;
             break;
-            
-        case wxCENTRE:
-            horiz = wxRIGHT;
+
+        case wxALIGN_CENTRE:
+            horiz = wxALIGN_RIGHT;
             break;
 
-        case wxRIGHT:
-            horiz = wxLEFT;
+        case wxALIGN_RIGHT:
+            horiz = wxALIGN_LEFT;
             break;
     }
 
@@ -275,19 +487,19 @@ void GridFrame::SetRowLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) )
 {
     int horiz, vert;
     grid->GetRowLabelAlignment( &horiz, &vert );
-    
+
     switch ( vert )
     {
-        case wxTOP:
-            vert = wxCENTRE;
+        case wxALIGN_TOP:
+            vert = wxALIGN_CENTRE;
             break;
-            
-        case wxCENTRE:
-            vert = wxBOTTOM;
+
+        case wxALIGN_CENTRE:
+            vert = wxALIGN_BOTTOM;
             break;
 
-        case wxBOTTOM:
-            vert = wxTOP;
+        case wxALIGN_BOTTOM:
+            vert = wxALIGN_TOP;
             break;
     }
 
@@ -299,19 +511,19 @@ void GridFrame::SetColLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) )
 {
     int horiz, vert;
     grid->GetColLabelAlignment( &horiz, &vert );
-    
+
     switch ( horiz )
     {
-        case wxLEFT:
-            horiz = wxCENTRE;
+        case wxALIGN_LEFT:
+            horiz = wxALIGN_CENTRE;
             break;
-            
-        case wxCENTRE:
-            horiz = wxRIGHT;
+
+        case wxALIGN_CENTRE:
+            horiz = wxALIGN_RIGHT;
             break;
 
-        case wxRIGHT:
-            horiz = wxLEFT;
+        case wxALIGN_RIGHT:
+            horiz = wxALIGN_LEFT;
             break;
     }
 
@@ -323,19 +535,19 @@ void GridFrame::SetColLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) )
 {
     int horiz, vert;
     grid->GetColLabelAlignment( &horiz, &vert );
-    
+
     switch ( vert )
     {
-        case wxTOP:
-            vert = wxCENTRE;
+        case wxALIGN_TOP:
+            vert = wxALIGN_CENTRE;
             break;
-            
-        case wxCENTRE:
-            vert = wxBOTTOM;
+
+        case wxALIGN_CENTRE:
+            vert = wxALIGN_BOTTOM;
             break;
 
-        case wxBOTTOM:
-            vert = wxTOP;
+        case wxALIGN_BOTTOM:
+            vert = wxALIGN_TOP;
             break;
     }
 
@@ -357,66 +569,155 @@ void GridFrame::SetGridLineColour( wxCommandEvent& WXUNUSED(ev) )
 }
 
 
+void GridFrame::InsertRow( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->InsertRows( grid->GetGridCursorRow(), 1 );
+}
+
+
+void GridFrame::InsertCol( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->InsertCols( grid->GetGridCursorCol(), 1 );
+}
+
+
+void GridFrame::DeleteSelectedRows( wxCommandEvent& WXUNUSED(ev) )
+{
+    if ( grid->IsSelection() )
+    {
+        grid->BeginBatch();
+        for ( int n = 0; n < grid->GetNumberRows(); )
+            if ( grid->IsInSelection( n , 0 ) )
+                grid->DeleteRows( n, 1 );
+           else
+               n++;
+        grid->EndBatch();
+    }
+}
+
+
+void GridFrame::DeleteSelectedCols( wxCommandEvent& WXUNUSED(ev) )
+{
+    if ( grid->IsSelection() )
+    {
+        grid->BeginBatch();
+        for ( int n = 0; n < grid->GetNumberCols(); )
+            if ( grid->IsInSelection( 0 , n ) )
+                grid->DeleteCols( n, 1 );
+           else
+               n++;
+        grid->EndBatch();
+    }
+}
+
+
 void GridFrame::ClearGrid( wxCommandEvent& WXUNUSED(ev) )
 {
     grid->ClearGrid();
 }
 
+void GridFrame::SelectCells( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->SetSelectionMode( wxGrid::wxGridSelectCells );
+}
 
-void GridFrame::About(  wxCommandEvent& WXUNUSED(ev) )
+void GridFrame::SelectRows( wxCommandEvent& WXUNUSED(ev) )
 {
-    (void)wxMessageBox( "\n\nwxGrid demo \n\n"
-                        "Michael Bedward \n"
-                        "mbedward@ozemail.com.au \n\n",
-                        "About",
-                        wxOK );
+    grid->SetSelectionMode( wxGrid::wxGridSelectRows );
 }
 
+void GridFrame::SelectCols( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->SetSelectionMode( wxGrid::wxGridSelectColumns );
+}
 
-void GridFrame::OnSize( wxSizeEvent& WXUNUSED(ev) )
+void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) )
 {
-    if ( grid && logWin )
+    wxColour col = wxGetColourFromUser(this);
+    if ( col.Ok() )
     {
-        int cw, ch;
-        GetClientSize( &cw, &ch );
-    
-        int gridH = ch - 90;
-        int logH  = 80;
-        if ( gridH < 0 )
-        {
-            gridH = ch;
-        }
-        
-        grid->SetSize( 0, 0, cw, gridH );
-        logWin->SetSize( 0, gridH + 10, cw, logH );
+        grid->SetDefaultCellTextColour(col);
+        grid->Refresh();
     }
 }
 
-void GridFrame::OnQuit( wxCommandEvent& WXUNUSED(ev) )
+void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) )
 {
-    Close( TRUE );
+    wxColour col = wxGetColourFromUser(this);
+    if ( col.Ok() )
+    {
+        grid->SetDefaultCellBackgroundColour(col);
+        grid->Refresh();
+    }
+}
+
+void GridFrame::DeselectCell(wxCommandEvent& WXUNUSED(event))
+{
+      grid->DeselectCell(3, 1);
+}
+
+void GridFrame::DeselectCol(wxCommandEvent& WXUNUSED(event))
+{
+      grid->DeselectCol(2);
+}
+
+void GridFrame::DeselectRow(wxCommandEvent& WXUNUSED(event))
+{
+      grid->DeselectRow(2);
+}
+
+void GridFrame::DeselectAll(wxCommandEvent& WXUNUSED(event))
+{
+      grid->ClearSelection();
+}
+
+void GridFrame::SelectCell(wxCommandEvent& WXUNUSED(event))
+{
+      grid->SelectBlock(3, 1, 3, 1, m_addToSel);
+}
+
+void GridFrame::SelectCol(wxCommandEvent& WXUNUSED(event))
+{
+      grid->SelectCol(2, m_addToSel);
+}
+
+void GridFrame::SelectRow(wxCommandEvent& WXUNUSED(event))
+{
+      grid->SelectRow(2, m_addToSel);
 }
 
+void GridFrame::SelectAll(wxCommandEvent& WXUNUSED(event))
+{
+      grid->SelectAll();
+}
+
+void GridFrame::OnAddToSelectToggle(wxCommandEvent& event)
+{
+    m_addToSel = event.IsChecked();
+}
 
 void GridFrame::OnLabelLeftClick( wxGridEvent& ev )
 {
     logBuf = "";
     if ( ev.GetRow() != -1 )
     {
-        logBuf << "row label " << ev.GetRow();
+        logBuf << "Left click on row label " << ev.GetRow();
     }
     else if ( ev.GetCol() != -1 )
     {
-        logBuf << "col label " << ev.GetCol();
+        logBuf << "Left click on col label " << ev.GetCol();
     }
     else
     {
-        logBuf << "corner label";
+        logBuf << "Left click on corner label";
     }
 
     if ( ev.ShiftDown() ) logBuf << " (shift down)";
-    wxLogMessage( "%s", logBuf.c_str() );
-    
+    if ( ev.ControlDown() ) logBuf << " (control down)";
+    wxLogMessage( wxT("%s"), logBuf.c_str() );
+
+    // you must call event skip if you want default grid processing
+    //
     ev.Skip();
 }
 
@@ -424,10 +725,10 @@ void GridFrame::OnLabelLeftClick( wxGridEvent& ev )
 void GridFrame::OnCellLeftClick( wxGridEvent& ev )
 {
     logBuf = "";
-    logBuf << "Cell at row " << ev.GetRow()
+    logBuf << "Left click at row " << ev.GetRow()
            << " col " << ev.GetCol();
-    wxLogMessage( "%s", logBuf.c_str() );
-    
+    wxLogMessage( wxT("%s"), logBuf.c_str() );
+
     // you must call event skip if you want default grid processing
     // (cell highlighting etc.)
     //
@@ -439,8 +740,8 @@ void GridFrame::OnRowSize( wxGridSizeEvent& ev )
 {
     logBuf = "";
     logBuf << "Resized row " << ev.GetRowOrCol();
-    wxLogMessage( "%s", logBuf.c_str() );
-    
+    wxLogMessage( wxT("%s"), logBuf.c_str() );
+
     ev.Skip();
 }
 
@@ -449,21 +750,49 @@ void GridFrame::OnColSize( wxGridSizeEvent& ev )
 {
     logBuf = "";
     logBuf << "Resized col " << ev.GetRowOrCol();
-    wxLogMessage( "%s", logBuf.c_str() );
-    
+    wxLogMessage( wxT("%s"), logBuf.c_str() );
+
+    ev.Skip();
+}
+
+
+void GridFrame::OnSelectCell( wxGridEvent& ev )
+{
+    logBuf = "";
+    if ( ev.Selecting() )
+        logBuf << "Selected ";
+    else
+        logBuf << "Deselected ";
+    logBuf << "cell at row " << ev.GetRow()
+           << " col " << ev.GetCol()
+           << " ( ControlDown: "<< (ev.ControlDown() ? 'T':'F')
+           << ", ShiftDown: "<< (ev.ShiftDown() ? 'T':'F')
+           << ", AltDown: "<< (ev.AltDown() ? 'T':'F')
+           << ", MetaDown: "<< (ev.MetaDown() ? 'T':'F') << " )";
+    wxLogMessage( wxT("%s"), logBuf.c_str() );
+
+    // you must call Skip() if you want the default processing
+    // to occur in wxGrid
     ev.Skip();
 }
 
 void GridFrame::OnRangeSelected( wxGridRangeSelectEvent& ev )
 {
     logBuf = "";
-    logBuf  << "Selected cells from row " << ev.GetTopRow()
-            << " col " << ev.GetLeftCol()
-            << " to row " << ev.GetBottomRow()
-            << " col " << ev.GetRightCol();
-    
-    wxLogMessage( "%s", logBuf.c_str() );
-    
+    if ( ev.Selecting() )
+        logBuf << "Selected ";
+    else
+        logBuf << "Deselected ";
+    logBuf << "cells from row " << ev.GetTopRow()
+           << " col " << ev.GetLeftCol()
+           << " to row " << ev.GetBottomRow()
+           << " col " << ev.GetRightCol()
+           << " ( ControlDown: "<< (ev.ControlDown() ? 'T':'F')
+           << ", ShiftDown: "<< (ev.ShiftDown() ? 'T':'F')
+           << ", AltDown: "<< (ev.AltDown() ? 'T':'F')
+           << ", MetaDown: "<< (ev.MetaDown() ? 'T':'F') << " )";
+    wxLogMessage( wxT("%s"), logBuf.c_str() );
+
     ev.Skip();
 }
 
@@ -471,12 +800,491 @@ void GridFrame::OnCellValueChanged( wxGridEvent& ev )
 {
     logBuf = "";
     logBuf  << "Value changed for cell at"
-            << " row " << ev.GetRow() 
+            << " row " << ev.GetRow()
             << " col " << ev.GetCol();
-    
-    wxLogMessage( "%s", logBuf.c_str() );
-    
+
+    wxLogMessage( wxT("%s"), logBuf.c_str() );
+
+    ev.Skip();
+}
+
+void GridFrame::OnEditorShown( wxGridEvent& ev )
+{
+
+    if ( (ev.GetCol() == 4) &&
+         (ev.GetRow() == 0) &&
+        (wxMessageBox(_T("Are you sure you wish to edit this cell"),
+                      _T("Checking"),wxYES_NO) == wxNO ) ) {
+
+        ev.Veto();
+        return;
+    }
+                     
+       
+    wxLogMessage( wxT("Cell editor shown.") );
+
+    ev.Skip();
+}
+
+void GridFrame::OnEditorHidden( wxGridEvent& ev )
+{
+   
+    if ( (ev.GetCol() == 4) &&
+         (ev.GetRow() == 0) &&
+        (wxMessageBox(_T("Are you sure you wish to finish editing this cell"),
+                      _T("Checking"),wxYES_NO) == wxNO ) ) {
+
+        ev.Veto();
+        return;
+    }
+
+    wxLogMessage( wxT("Cell editor hidden.") );
+
     ev.Skip();
 }
 
+void GridFrame::About(  wxCommandEvent& WXUNUSED(ev) )
+{
+    (void)wxMessageBox( "\n\nwxGrid demo \n\n"
+                        "Michael Bedward \n"
+                        "mbedward@ozemail.com.au \n\n",
+                        "About",
+                        wxOK );
+}
+
+
+void GridFrame::OnQuit( wxCommandEvent& WXUNUSED(ev) )
+{
+    Close( TRUE );
+}
+
+void GridFrame::OnBugsTable(wxCommandEvent& )
+{
+    BugsGridFrame *frame = new BugsGridFrame;
+    frame->Show(TRUE);
+}
+
+
+void GridFrame::OnVTable(wxCommandEvent& )
+{
+    static long s_sizeGrid = 10000;
+
+#ifdef __WXMOTIF__
+    // MB: wxGetNumberFromUser doesn't work properly for wxMotif
+    wxString s;
+    s << s_sizeGrid;
+    s = wxGetTextFromUser( "Size of the table to create",
+                           "Size:",
+                           s );
+
+    s.ToLong( &s_sizeGrid );
+
+#else
+    s_sizeGrid = wxGetNumberFromUser("Size of the table to create",
+                                     "Size: ",
+                                     "wxGridDemo question",
+                                     s_sizeGrid,
+                                     0, 32000, this);
+#endif
+
+    if ( s_sizeGrid != -1 )
+    {
+        BigGridFrame* win = new BigGridFrame(s_sizeGrid);
+        win->Show(TRUE);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// MyGridCellRenderer
+// ----------------------------------------------------------------------------
+
+// do something that the default renderer doesn't here just to show that it is
+// possible to alter the appearance of the cell beyond what the attributes
+// allow
+void MyGridCellRenderer::Draw(wxGrid& grid,
+                              wxGridCellAttr& attr,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int row, int col,
+                              bool isSelected)
+{
+    wxGridCellStringRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
+
+    dc.SetPen(*wxGREEN_PEN);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.DrawEllipse(rect);
+}
+
+// ----------------------------------------------------------------------------
+// MyGridCellAttrProvider
+// ----------------------------------------------------------------------------
+
+MyGridCellAttrProvider::MyGridCellAttrProvider()
+{
+    m_attrForOddRows = new wxGridCellAttr;
+    m_attrForOddRows->SetBackgroundColour(*wxLIGHT_GREY);
+}
+
+MyGridCellAttrProvider::~MyGridCellAttrProvider()
+{
+    m_attrForOddRows->DecRef();
+}
+
+wxGridCellAttr *MyGridCellAttrProvider::GetAttr(int row, int col,
+                           wxGridCellAttr::wxAttrKind  kind /* = wxGridCellAttr::Any */) const
+{
+    wxGridCellAttr *attr = wxGridCellAttrProvider::GetAttr(row, col, kind);
+
+    if ( row % 2 )
+    {
+        if ( !attr )
+        {
+            attr = m_attrForOddRows;
+            attr->IncRef();
+        }
+        else
+        {
+            if ( !attr->HasBackgroundColour() )
+            {
+                wxGridCellAttr *attrNew = attr->Clone();
+                attr->DecRef();
+                attr = attrNew;
+                attr->SetBackgroundColour(*wxLIGHT_GREY);
+            }
+        }
+    }
+
+    return attr;
+}
+
+// ============================================================================
+// BigGridFrame and BigGridTable:  Sample of a non-standard table
+// ============================================================================
+
+BigGridFrame::BigGridFrame(long sizeGrid)
+            : wxFrame(NULL, -1, "Plugin Virtual Table",
+                      wxDefaultPosition, wxSize(500, 450))
+{
+    m_grid = new wxGrid(this, -1, wxDefaultPosition, wxDefaultSize);
+    m_table = new BigGridTable(sizeGrid);
+
+    // VZ: I don't understand why this slows down the display that much,
+    //     must profile it...
+    //m_table->SetAttrProvider(new MyGridCellAttrProvider);
+
+    m_grid->SetTable(m_table, TRUE);
+
+#if defined __WXMOTIF__
+    // MB: the grid isn't getting a sensible default size under wxMotif
+    int cw, ch;
+    GetClientSize( &cw, &ch );
+    m_grid->SetSize( cw, ch );
+#endif
+}
+
+// ============================================================================
+// BugsGridFrame: a "realistic" table
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// bugs table data
+// ----------------------------------------------------------------------------
+
+enum Columns
+{
+    Col_Id,
+    Col_Summary,
+    Col_Severity,
+    Col_Priority,
+    Col_Platform,
+    Col_Opened,
+    Col_Max
+};
+
+enum Severity
+{
+    Sev_Wish,
+    Sev_Minor,
+    Sev_Normal,
+    Sev_Major,
+    Sev_Critical,
+    Sev_Max
+};
+
+static const wxString severities[] =
+{
+    _T("wishlist"),
+    _T("minor"),
+    _T("normal"),
+    _T("major"),
+    _T("critical"),
+};
+
+static struct BugsGridData
+{
+    int id;
+    wxChar summary[80];
+    Severity severity;
+    int prio;
+    wxChar platform[12];
+    bool opened;
+} gs_dataBugsGrid [] =
+{
+    { 18, _T("foo doesn't work"), Sev_Major, 1, _T("wxMSW"), TRUE },
+    { 27, _T("bar crashes"), Sev_Critical, 1, _T("all"), FALSE },
+    { 45, _T("printing is slow"), Sev_Minor, 3, _T("wxMSW"), TRUE },
+    { 68, _T("Rectangle() fails"), Sev_Normal, 1, _T("wxMSW"), FALSE },
+};
+
+static const wxChar *headers[Col_Max] =
+{
+    _T("Id"),
+    _T("Summary"),
+    _T("Severity"),
+    _T("Priority"),
+    _T("Platform"),
+    _T("Opened?"),
+};
+
+// ----------------------------------------------------------------------------
+// BugsGridTable
+// ----------------------------------------------------------------------------
+
+wxString BugsGridTable::GetTypeName(int WXUNUSED(row), int col)
+{
+    switch ( col )
+    {
+        case Col_Id:
+        case Col_Priority:
+            return wxGRID_VALUE_NUMBER;;
+
+        case Col_Severity:
+            // fall thorugh (TODO should be a list)
+
+        case Col_Summary:
+            return wxString::Format(_T("%s:80"), wxGRID_VALUE_STRING);
+
+        case Col_Platform:
+            return wxString::Format(_T("%s:all,MSW,GTK,other"), wxGRID_VALUE_CHOICE);
+
+        case Col_Opened:
+            return wxGRID_VALUE_BOOL;
+    }
+
+    wxFAIL_MSG(_T("unknown column"));
+
+    return wxEmptyString;
+}
+
+int BugsGridTable::GetNumberRows()
+{
+    return WXSIZEOF(gs_dataBugsGrid);
+}
+
+int BugsGridTable::GetNumberCols()
+{
+    return Col_Max;
+}
+
+bool BugsGridTable::IsEmptyCell( int row, int col )
+{
+    return FALSE;
+}
+
+wxString BugsGridTable::GetValue( int row, int col )
+{
+    const BugsGridData& gd = gs_dataBugsGrid[row];
+
+    switch ( col )
+    {
+        case Col_Id:
+        case Col_Priority:
+        case Col_Opened:
+            wxFAIL_MSG(_T("unexpected column"));
+            break;
+
+        case Col_Severity:
+            return severities[gd.severity];
+
+        case Col_Summary:
+            return gd.summary;
+
+        case Col_Platform:
+            return gd.platform;
+    }
+
+    return wxEmptyString;
+}
+
+void BugsGridTable::SetValue( int row, int col, const wxString& value )
+{
+    BugsGridData& gd = gs_dataBugsGrid[row];
+
+    switch ( col )
+    {
+        case Col_Id:
+        case Col_Priority:
+        case Col_Opened:
+            wxFAIL_MSG(_T("unexpected column"));
+            break;
+
+        case Col_Severity:
+            {
+                size_t n;
+                for ( n = 0; n < WXSIZEOF(severities); n++ )
+                {
+                    if ( severities[n] == value )
+                    {
+                        gd.severity = (Severity)n;
+                        break;
+                    }
+                }
+
+                if ( n == WXSIZEOF(severities) )
+                {
+                    wxLogWarning(_T("Invalid severity value '%s'."),
+                                 value.c_str());
+                    gd.severity = Sev_Normal;
+                }
+            }
+            break;
+
+        case Col_Summary:
+            wxStrncpy(gd.summary, value, WXSIZEOF(gd.summary));
+            break;
+
+        case Col_Platform:
+            wxStrncpy(gd.platform, value, WXSIZEOF(gd.platform));
+            break;
+    }
+}
+
+bool BugsGridTable::CanGetValueAs( int WXUNUSED(row), int col, const wxString& typeName )
+{
+    if ( typeName == wxGRID_VALUE_STRING )
+    {
+        return TRUE;
+    }
+    else if ( typeName == wxGRID_VALUE_BOOL )
+    {
+        return col == Col_Opened;
+    }
+    else if ( typeName == wxGRID_VALUE_NUMBER )
+    {
+        return col == Col_Id || col == Col_Priority || col == Col_Severity;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+bool BugsGridTable::CanSetValueAs( int row, int col, const wxString& typeName )
+{
+    return CanGetValueAs(row, col, typeName);
+}
+
+long BugsGridTable::GetValueAsLong( int row, int col )
+{
+    const BugsGridData& gd = gs_dataBugsGrid[row];
+
+    switch ( col )
+    {
+        case Col_Id:
+            return gd.id;
+
+        case Col_Priority:
+            return gd.prio;
+
+        case Col_Severity:
+            return gd.severity;
+
+        default:
+            wxFAIL_MSG(_T("unexpected column"));
+            return -1;
+    }
+}
+
+bool BugsGridTable::GetValueAsBool( int row, int col )
+{
+    if ( col == Col_Opened )
+    {
+        return gs_dataBugsGrid[row].opened;
+    }
+    else
+    {
+        wxFAIL_MSG(_T("unexpected column"));
+
+        return FALSE;
+    }
+}
+
+void BugsGridTable::SetValueAsLong( int row, int col, long value )
+{
+    BugsGridData& gd = gs_dataBugsGrid[row];
+
+    switch ( col )
+    {
+        case Col_Priority:
+            gd.prio = value;
+            break;
+
+        default:
+            wxFAIL_MSG(_T("unexpected column"));
+    }
+}
+
+void BugsGridTable::SetValueAsBool( int row, int col, bool value )
+{
+    if ( col == Col_Opened )
+    {
+        gs_dataBugsGrid[row].opened = value;
+    }
+    else
+    {
+        wxFAIL_MSG(_T("unexpected column"));
+    }
+}
+
+wxString BugsGridTable::GetColLabelValue( int col )
+{
+    return headers[col];
+}
+
+BugsGridTable::BugsGridTable()
+{
+}
+
+// ----------------------------------------------------------------------------
+// BugsGridFrame
+// ----------------------------------------------------------------------------
+
+BugsGridFrame::BugsGridFrame()
+             : wxFrame(NULL, -1, "Bugs table",
+                       wxDefaultPosition, wxSize(500, 300))
+{
+    wxGrid *grid = new wxGrid(this, -1, wxDefaultPosition);
+    wxGridTableBase *table = new BugsGridTable();
+    table->SetAttrProvider(new MyGridCellAttrProvider);
+    grid->SetTable(table, TRUE);
+
+    wxGridCellAttr *attrRO = new wxGridCellAttr,
+                   *attrRangeEditor = new wxGridCellAttr,
+                   *attrCombo = new wxGridCellAttr;
+
+    attrRO->SetReadOnly();
+    attrRangeEditor->SetEditor(new wxGridCellNumberEditor(1, 5));
+    attrCombo->SetEditor(new wxGridCellChoiceEditor(WXSIZEOF(severities),
+                                                    severities));
+
+    grid->SetColAttr(Col_Id, attrRO);
+    grid->SetColAttr(Col_Priority, attrRangeEditor);
+    grid->SetColAttr(Col_Severity, attrCombo);
+
+    grid->SetMargins(0, 0);
+
+    grid->Fit();
+    SetClientSize(grid->GetSize());
+}
+