Changes to make commandline compilation with VC6 match the same settings and LIB...

[wxWidgets.git] / samples / newgrid / griddemo.cpp

diff --git a/samples/newgrid/griddemo.cpp b/samples/newgrid/griddemo.cpp
index 35c0713d5c8d48422339facaeee74e30f3902ca6..aaf3bebcd5e048dcc9f106cf9043b8c55082a56c 100644 (file)
--- a/samples/newgrid/griddemo.cpp
+++ b/samples/newgrid/griddemo.cpp
@@ -35,6 +35,7 @@
 #include "wx/colordlg.h"
 
 #include "wx/grid.h"
 #include "wx/colordlg.h"
 
 #include "wx/grid.h"

+#include "wx/generic/gridctrl.h"

 
 #include "griddemo.h"
 
 
 #include "griddemo.h"
 


@@ -71,6 +72,8 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_MENU( ID_TOGGLEROWSIZING, GridFrame::ToggleRowSizing )
     EVT_MENU( ID_TOGGLECOLSIZING, GridFrame::ToggleColSizing )
     EVT_MENU( ID_TOGGLEGRIDSIZING, GridFrame::ToggleGridSizing )
     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_SETLABELCOLOUR, GridFrame::SetLabelColour )
     EVT_MENU( ID_SETLABELTEXTCOLOUR, GridFrame::SetLabelTextColour )
     EVT_MENU( ID_ROWLABELHORIZALIGN, GridFrame::SetRowLabelHorizAlignment )


@@ -95,6 +98,19 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_MENU( ID_VTABLE, GridFrame::OnVTable)
     EVT_MENU( ID_BUGS_TABLE, GridFrame::OnBugsTable)
 
     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_LABEL_LEFT_CLICK( GridFrame::OnLabelLeftClick )
     EVT_GRID_CELL_LEFT_CLICK( GridFrame::OnCellLeftClick )
     EVT_GRID_ROW_SIZE( GridFrame::OnRowSize )


@@ -129,6 +145,10 @@ GridFrame::GridFrame()
     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_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;
 
 
     wxMenu *rowLabelMenu = new wxMenu;
 


@@ -162,16 +182,28 @@ GridFrame::GridFrame()
     editMenu->Append( ID_DELETECOL, "Delete selected co&ls" );
     editMenu->Append( ID_CLEARGRID, "Cl&ear grid cell contents" );
 
     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;
     wxMenu *selectionMenu = new wxMenu;

-
-    editMenu->Append( ID_CHANGESEL, "Change &selection mode",
-                     selectionMenu,
-                     "Change selection mode" );
+    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" );
 
 
     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" );
 
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append( ID_ABOUT, "&About wxGrid demo" );
 


@@ -180,10 +212,13 @@ GridFrame::GridFrame()
     menuBar->Append( viewMenu, "&View" );
     menuBar->Append( colMenu,  "&Colours" );
     menuBar->Append( editMenu, "&Edit" );
     menuBar->Append( viewMenu, "&View" );
     menuBar->Append( colMenu,  "&Colours" );
     menuBar->Append( editMenu, "&Edit" );

+    menuBar->Append( selectMenu, "&Select" );

     menuBar->Append( helpMenu, "&Help" );
 
     SetMenuBar( menuBar );
 
     menuBar->Append( helpMenu, "&Help" );
 
     SetMenuBar( menuBar );
 

+    m_addToSel = FALSE;
+

     grid = new wxGrid( this,
                        -1,
                        wxPoint( 0, 0 ),
     grid = new wxGrid( this,
                        -1,
                        wxPoint( 0, 0 ),


@@ -207,7 +242,10 @@ GridFrame::GridFrame()
     grid->SetRowSize( 0, 60 );
     grid->SetCellValue( 0, 0, "Ctrl+Home\nwill go to\nthis cell" );
 
     grid->SetRowSize( 0, 60 );
     grid->SetCellValue( 0, 0, "Ctrl+Home\nwill go to\nthis cell" );
 

-    grid->SetCellValue( 0, 1, "Blah" );
+    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, 2, "Blah" );
     grid->SetCellValue( 0, 3, "Read only" );
     grid->SetReadOnly( 0, 3 );
     grid->SetCellValue( 0, 2, "Blah" );
     grid->SetCellValue( 0, 3, "Read only" );
     grid->SetReadOnly( 0, 3 );


@@ -225,10 +263,10 @@ GridFrame::GridFrame()
     grid->SetCellBackgroundColour(3, 3, *wxLIGHT_GREY);
 
     grid->SetCellValue(4, 4, "a weird looking cell");
     grid->SetCellBackgroundColour(3, 3, *wxLIGHT_GREY);
 
     grid->SetCellValue(4, 4, "a weird looking cell");

-    grid->SetCellAlignment(4, 4, wxCENTRE, wxCENTRE);
+    grid->SetCellAlignment(4, 4, wxALIGN_CENTRE, wxALIGN_CENTRE);

     grid->SetCellRenderer(4, 4, new MyGridCellRenderer);
 
     grid->SetCellRenderer(4, 4, new MyGridCellRenderer);
 

-    grid->SetCellValue(3, 0, "1");
+    grid->SetCellValue(3, 0, "0");

     grid->SetCellRenderer(3, 0, new wxGridCellBoolRenderer);
     grid->SetCellEditor(3, 0, new wxGridCellBoolEditor);
 
     grid->SetCellRenderer(3, 0, new wxGridCellBoolRenderer);
     grid->SetCellEditor(3, 0, new wxGridCellBoolEditor);
 


@@ -237,23 +275,27 @@ GridFrame::GridFrame()
     attr->SetTextColour(*wxBLUE);
     grid->SetColAttr(5, attr);
     attr = new wxGridCellAttr;
     attr->SetTextColour(*wxBLUE);
     grid->SetColAttr(5, attr);
     attr = new wxGridCellAttr;

-    attr->SetBackgroundColour(*wxBLUE);
+    attr->SetBackgroundColour(*wxRED);

     grid->SetRowAttr(5, attr);
 
     grid->SetCellValue(2, 4, "a wider column");
     grid->SetColSize(4, 120);
     grid->SetColMinimalWidth(4, 120);
 
     grid->SetRowAttr(5, attr);
 
     grid->SetCellValue(2, 4, "a wider column");
     grid->SetColSize(4, 120);
     grid->SetColMinimalWidth(4, 120);
 

-    grid->SetColFormatFloat(5);
-    grid->SetCellValue(0, 5, "3.1415");
-    grid->SetCellValue(1, 5, "1415");
-    grid->SetCellValue(2, 5, "12345.67890");
+    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, 6, 2);
+    grid->SetColFormatFloat(6);

     grid->SetCellValue(0, 6, "3.1415");
     grid->SetCellValue(1, 6, "1415");
     grid->SetCellValue(2, 6, "12345.67890");
 
     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,
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     topSizer->Add( grid,
                    1,


@@ -288,6 +330,7 @@ void GridFrame::SetDefaults()
     GetMenuBar()->Check( ID_TOGGLEROWSIZING, TRUE );
     GetMenuBar()->Check( ID_TOGGLECOLSIZING, TRUE );
     GetMenuBar()->Check( ID_TOGGLEGRIDSIZING, TRUE );
     GetMenuBar()->Check( ID_TOGGLEROWSIZING, TRUE );
     GetMenuBar()->Check( ID_TOGGLECOLSIZING, TRUE );
     GetMenuBar()->Check( ID_TOGGLEGRIDSIZING, TRUE );

+    GetMenuBar()->Check( ID_TOGGLEGRIDLINES, TRUE );

 }
 
 
 }
 
 


@@ -344,6 +387,49 @@ void GridFrame::ToggleGridSizing( wxCommandEvent& WXUNUSED(ev) )
 }
 
 
 }
 
 

+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();
+}
+
+

 void GridFrame::SetLabelColour( wxCommandEvent& WXUNUSED(ev) )
 {
     wxColourDialog dlg( NULL );
 void GridFrame::SetLabelColour( wxCommandEvent& WXUNUSED(ev) )
 {
     wxColourDialog dlg( NULL );


@@ -379,16 +465,16 @@ void GridFrame::SetRowLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) )
 
     switch ( horiz )
     {
 
     switch ( horiz )
     {

-        case wxLEFT:
-            horiz = wxCENTRE;
+        case wxALIGN_LEFT:
+            horiz = wxALIGN_CENTRE;

             break;
 
             break;
 

-        case wxCENTRE:
-            horiz = wxRIGHT;
+        case wxALIGN_CENTRE:
+            horiz = wxALIGN_RIGHT;

             break;
 
             break;
 

-        case wxRIGHT:
-            horiz = wxLEFT;
+        case wxALIGN_RIGHT:
+            horiz = wxALIGN_LEFT;

             break;
     }
 
             break;
     }
 


@@ -402,16 +488,16 @@ void GridFrame::SetRowLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) )
 
     switch ( vert )
     {
 
     switch ( vert )
     {

-        case wxTOP:
-            vert = wxCENTRE;
+        case wxALIGN_TOP:
+            vert = wxALIGN_CENTRE;

             break;
 
             break;
 

-        case wxCENTRE:
-            vert = wxBOTTOM;
+        case wxALIGN_CENTRE:
+            vert = wxALIGN_BOTTOM;

             break;
 
             break;
 

-        case wxBOTTOM:
-            vert = wxTOP;
+        case wxALIGN_BOTTOM:
+            vert = wxALIGN_TOP;

             break;
     }
 
             break;
     }
 


@@ -426,16 +512,16 @@ void GridFrame::SetColLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) )
 
     switch ( horiz )
     {
 
     switch ( horiz )
     {

-        case wxLEFT:
-            horiz = wxCENTRE;
+        case wxALIGN_LEFT:
+            horiz = wxALIGN_CENTRE;

             break;
 
             break;
 

-        case wxCENTRE:
-            horiz = wxRIGHT;
+        case wxALIGN_CENTRE:
+            horiz = wxALIGN_RIGHT;

             break;
 
             break;
 

-        case wxRIGHT:
-            horiz = wxLEFT;
+        case wxALIGN_RIGHT:
+            horiz = wxALIGN_LEFT;

             break;
     }
 
             break;
     }
 


@@ -450,16 +536,16 @@ void GridFrame::SetColLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) )
 
     switch ( vert )
     {
 
     switch ( vert )
     {

-        case wxTOP:
-            vert = wxCENTRE;
+        case wxALIGN_TOP:
+            vert = wxALIGN_CENTRE;

             break;
 
             break;
 

-        case wxCENTRE:
-            vert = wxBOTTOM;
+        case wxALIGN_CENTRE:
+            vert = wxALIGN_BOTTOM;

             break;
 
             break;
 

-        case wxBOTTOM:
-            vert = wxTOP;
+        case wxALIGN_BOTTOM:
+            vert = wxALIGN_TOP;

             break;
     }
 
             break;
     }
 


@@ -497,9 +583,13 @@ void GridFrame::DeleteSelectedRows( wxCommandEvent& WXUNUSED(ev) )
 {
     if ( grid->IsSelection() )
     {
 {
     if ( grid->IsSelection() )
     {

-        for ( int n = 0; n < grid->GetNumberRows(); n++ )
-           if ( grid->IsInSelection( n , 0 ) )
-               grid->DeleteRows( n, 1 );
+        grid->BeginBatch();
+        for ( int n = 0; n < grid->GetNumberRows(); )
+            if ( grid->IsInSelection( n , 0 ) )
+                grid->DeleteRows( n, 1 );
+           else
+               n++;
+        grid->EndBatch();

     }
 }
 
     }
 }
 


@@ -508,9 +598,13 @@ void GridFrame::DeleteSelectedCols( wxCommandEvent& WXUNUSED(ev) )
 {
     if ( grid->IsSelection() )
     {
 {
     if ( grid->IsSelection() )
     {

-        for ( int n = 0; n < grid->GetNumberCols(); n++ )
-           if ( grid->IsInSelection( 0 , n ) )
-               grid->DeleteCols( n, 1 );
+        grid->BeginBatch();
+        for ( int n = 0; n < grid->GetNumberCols(); )
+            if ( grid->IsInSelection( 0 , n ) )
+                grid->DeleteCols( n, 1 );
+           else
+               n++;
+        grid->EndBatch();

     }
 }
 
     }
 }
 


@@ -555,6 +649,51 @@ void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) )
     }
 }
 
     }
 }
 

+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 = "";
 void GridFrame::OnLabelLeftClick( wxGridEvent& ev )
 {
     logBuf = "";


@@ -572,7 +711,8 @@ void GridFrame::OnLabelLeftClick( wxGridEvent& ev )
     }
 
     if ( ev.ShiftDown() ) logBuf << " (shift down)";
     }
 
     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
     //
 
     // you must call event skip if you want default grid processing
     //


@@ -585,7 +725,7 @@ void GridFrame::OnCellLeftClick( wxGridEvent& ev )
     logBuf = "";
     logBuf << "Left click at row " << ev.GetRow()
            << " col " << ev.GetCol();
     logBuf = "";
     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.)
 
     // you must call event skip if you want default grid processing
     // (cell highlighting etc.)


@@ -598,7 +738,7 @@ void GridFrame::OnRowSize( wxGridSizeEvent& ev )
 {
     logBuf = "";
     logBuf << "Resized row " << ev.GetRowOrCol();
 {
     logBuf = "";
     logBuf << "Resized row " << ev.GetRowOrCol();

-    wxLogMessage( "%s", logBuf.c_str() );
+    wxLogMessage( wxT("%s"), logBuf.c_str() );

 
     ev.Skip();
 }
 
     ev.Skip();
 }


@@ -608,7 +748,7 @@ void GridFrame::OnColSize( wxGridSizeEvent& ev )
 {
     logBuf = "";
     logBuf << "Resized col " << ev.GetRowOrCol();
 {
     logBuf = "";
     logBuf << "Resized col " << ev.GetRowOrCol();

-    wxLogMessage( "%s", logBuf.c_str() );
+    wxLogMessage( wxT("%s"), logBuf.c_str() );

 
     ev.Skip();
 }
 
     ev.Skip();
 }


@@ -617,9 +757,17 @@ void GridFrame::OnColSize( wxGridSizeEvent& ev )
 void GridFrame::OnSelectCell( wxGridEvent& ev )
 {
     logBuf = "";
 void GridFrame::OnSelectCell( wxGridEvent& ev )
 {
     logBuf = "";

-    logBuf << "Selected cell at row " << ev.GetRow()
-           << " col " << ev.GetCol();
-    wxLogMessage( "%s", logBuf.c_str() );
+    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
 
     // you must call Skip() if you want the default processing
     // to occur in wxGrid


@@ -629,12 +777,19 @@ void GridFrame::OnSelectCell( wxGridEvent& ev )
 void GridFrame::OnRangeSelected( wxGridRangeSelectEvent& ev )
 {
     logBuf = "";
 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();
 }
 
     ev.Skip();
 }


@@ -646,21 +801,21 @@ void GridFrame::OnCellValueChanged( wxGridEvent& ev )
             << " row " << ev.GetRow()
             << " col " << ev.GetCol();
 
             << " row " << ev.GetRow()
             << " col " << ev.GetCol();
 

-    wxLogMessage( "%s", logBuf.c_str() );
+    wxLogMessage( wxT("%s"), logBuf.c_str() );

 
     ev.Skip();
 }
 
 void GridFrame::OnEditorShown( wxGridEvent& ev )
 {
 
     ev.Skip();
 }
 
 void GridFrame::OnEditorShown( wxGridEvent& ev )
 {

-    wxLogMessage( "Cell editor shown." );
+    wxLogMessage( wxT("Cell editor shown.") );

 
     ev.Skip();
 }
 
 void GridFrame::OnEditorHidden( wxGridEvent& ev )
 {
 
     ev.Skip();
 }
 
 void GridFrame::OnEditorHidden( wxGridEvent& ev )
 {

-    wxLogMessage( "Cell editor hidden." );
+    wxLogMessage( wxT("Cell editor hidden.") );

 
     ev.Skip();
 }
 
     ev.Skip();
 }


@@ -686,6 +841,7 @@ void GridFrame::OnBugsTable(wxCommandEvent& )
     frame->Show(TRUE);
 }
 
     frame->Show(TRUE);
 }
 

+

 void GridFrame::OnVTable(wxCommandEvent& )
 {
     static long s_sizeGrid = 10000;
 void GridFrame::OnVTable(wxCommandEvent& )
 {
     static long s_sizeGrid = 10000;


@@ -751,9 +907,10 @@ MyGridCellAttrProvider::~MyGridCellAttrProvider()
     m_attrForOddRows->DecRef();
 }
 
     m_attrForOddRows->DecRef();
 }
 

-wxGridCellAttr *MyGridCellAttrProvider::GetAttr(int row, int col) const
+wxGridCellAttr *MyGridCellAttrProvider::GetAttr(int row, int col,
+                           wxGridCellAttr::wxAttrKind  kind /* = wxGridCellAttr::Any */) const

 {
 {

-    wxGridCellAttr *attr = wxGridCellAttrProvider::GetAttr(row, col);
+    wxGridCellAttr *attr = wxGridCellAttrProvider::GetAttr(row, col, kind);

 
     if ( row % 2 )
     {
 
     if ( row % 2 )
     {


@@ -831,7 +988,7 @@ enum Severity
     Sev_Max
 };
 
     Sev_Max
 };
 

-static const wxChar* severities[] =
+static const wxString severities[] =

 {
     _T("wishlist"),
     _T("minor"),
 {
     _T("wishlist"),
     _T("minor"),


@@ -896,12 +1053,12 @@ wxString BugsGridTable::GetTypeName(int WXUNUSED(row), int col)
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-long BugsGridTable::GetNumberRows()
+int BugsGridTable::GetNumberRows()

 {
     return WXSIZEOF(gs_dataBugsGrid);
 }
 
 {
     return WXSIZEOF(gs_dataBugsGrid);
 }
 

-long BugsGridTable::GetNumberCols()
+int BugsGridTable::GetNumberCols()

 {
     return Col_Max;
 }
 {
     return Col_Max;
 }


@@ -1104,8 +1261,7 @@ BugsGridFrame::BugsGridFrame()
     grid->SetMargins(0, 0);
 
     grid->Fit();
     grid->SetMargins(0, 0);
 
     grid->Fit();

-    wxSize size = grid->GetSize();
-    size.x += 10;
-    size.y += 10;
-    SetClientSize(size);
+    SetClientSize(grid->GetSize());

 }
 }

+
+