X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ee5fc9c92dcd59df908170ccf812c35d263d555..fe31f91ccbc65c01c7169f57c912fe03c5550087:/samples/newgrid/griddemo.cpp diff --git a/samples/newgrid/griddemo.cpp b/samples/newgrid/griddemo.cpp index 62f86554f9..c8d022ef55 100644 --- a/samples/newgrid/griddemo.cpp +++ b/samples/newgrid/griddemo.cpp @@ -35,6 +35,7 @@ #include "wx/colordlg.h" #include "wx/grid.h" +#include "wx/generic/gridctrl.h" #include "griddemo.h" @@ -69,7 +70,10 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame ) 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_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 ) @@ -82,6 +86,9 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame ) 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 ) @@ -91,6 +98,19 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame ) 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 ) @@ -124,6 +144,11 @@ GridFrame::GridFrame() 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; @@ -157,6 +182,28 @@ GridFrame::GridFrame() 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" ); @@ -165,10 +212,13 @@ GridFrame::GridFrame() 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 ), @@ -182,17 +232,20 @@ GridFrame::GridFrame() 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 gs_dataBugsGrid + // table for strings grid->CreateGrid( 100, 100 ); 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 ); @@ -210,10 +263,10 @@ GridFrame::GridFrame() 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->SetCellValue(3, 0, "1"); + grid->SetCellValue(3, 0, "0"); grid->SetCellRenderer(3, 0, new wxGridCellBoolRenderer); grid->SetCellEditor(3, 0, new wxGridCellBoolEditor); @@ -222,13 +275,27 @@ GridFrame::GridFrame() 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->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, @@ -251,6 +318,7 @@ GridFrame::GridFrame() GridFrame::~GridFrame() { + delete wxLog::SetActiveTarget(m_logOld); } @@ -261,6 +329,8 @@ void GridFrame::SetDefaults() 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 ); } @@ -299,17 +369,66 @@ void GridFrame::ToggleEditing( wxCommandEvent& WXUNUSED(ev) ) void GridFrame::ToggleRowSizing( wxCommandEvent& WXUNUSED(ev) ) { - grid->EnableDragRowSize( + grid->EnableDragRowSize( GetMenuBar()->IsChecked( ID_TOGGLEROWSIZING ) ); } void GridFrame::ToggleColSizing( wxCommandEvent& WXUNUSED(ev) ) { - grid->EnableDragColSize( + 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(); +} + void GridFrame::SetLabelColour( wxCommandEvent& WXUNUSED(ev) ) { @@ -346,16 +465,16 @@ void GridFrame::SetRowLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) ) 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; } @@ -369,16 +488,16 @@ void GridFrame::SetRowLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) ) 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; } @@ -393,16 +512,16 @@ void GridFrame::SetColLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) ) 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; } @@ -417,16 +536,16 @@ void GridFrame::SetColLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) ) 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; } @@ -464,9 +583,13 @@ void GridFrame::DeleteSelectedRows( wxCommandEvent& WXUNUSED(ev) ) { if ( grid->IsSelection() ) { - int topRow, bottomRow, leftCol, rightCol; - grid->GetSelection( &topRow, &leftCol, &bottomRow, &rightCol ); - grid->DeleteRows( topRow, bottomRow - topRow + 1 ); + grid->BeginBatch(); + for ( int n = 0; n < grid->GetNumberRows(); ) + if ( grid->IsInSelection( n , 0 ) ) + grid->DeleteRows( n, 1 ); + else + n++; + grid->EndBatch(); } } @@ -475,9 +598,13 @@ void GridFrame::DeleteSelectedCols( wxCommandEvent& WXUNUSED(ev) ) { if ( grid->IsSelection() ) { - int topRow, bottomRow, leftCol, rightCol; - grid->GetSelection( &topRow, &leftCol, &bottomRow, &rightCol ); - grid->DeleteCols( leftCol, rightCol - leftCol + 1 ); + grid->BeginBatch(); + for ( int n = 0; n < grid->GetNumberCols(); ) + if ( grid->IsInSelection( 0 , n ) ) + grid->DeleteCols( n, 1 ); + else + n++; + grid->EndBatch(); } } @@ -487,6 +614,21 @@ void GridFrame::ClearGrid( wxCommandEvent& WXUNUSED(ev) ) grid->ClearGrid(); } +void GridFrame::SelectCells( wxCommandEvent& WXUNUSED(ev) ) +{ + grid->SetSelectionMode( wxGrid::wxGridSelectCells ); +} + +void GridFrame::SelectRows( wxCommandEvent& WXUNUSED(ev) ) +{ + grid->SetSelectionMode( wxGrid::wxGridSelectRows ); +} + +void GridFrame::SelectCols( wxCommandEvent& WXUNUSED(ev) ) +{ + grid->SetSelectionMode( wxGrid::wxGridSelectColumns ); +} + void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) ) { wxColour col = wxGetColourFromUser(this); @@ -507,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 = ""; @@ -524,6 +711,7 @@ void GridFrame::OnLabelLeftClick( wxGridEvent& ev ) } if ( ev.ShiftDown() ) logBuf << " (shift down)"; + if ( ev.ControlDown() ) logBuf << " (control down)"; wxLogMessage( "%s", logBuf.c_str() ); // you must call event skip if you want default grid processing @@ -569,8 +757,16 @@ void GridFrame::OnColSize( wxGridSizeEvent& ev ) void GridFrame::OnSelectCell( wxGridEvent& ev ) { logBuf = ""; - logBuf << "Selected cell at row " << ev.GetRow() - << " col " << ev.GetCol(); + 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( "%s", logBuf.c_str() ); // you must call Skip() if you want the default processing @@ -581,11 +777,18 @@ void GridFrame::OnSelectCell( wxGridEvent& ev ) void GridFrame::OnRangeSelected( wxGridRangeSelectEvent& ev ) { logBuf = ""; - logBuf << "Selected cells from row " << ev.GetTopRow() - << " col " << ev.GetLeftCol() - << " to row " << ev.GetBottomRow() - << " col " << ev.GetRightCol(); - + 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( "%s", logBuf.c_str() ); ev.Skip(); @@ -638,15 +841,29 @@ void GridFrame::OnBugsTable(wxCommandEvent& ) 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); @@ -675,22 +892,79 @@ void MyGridCellRenderer::Draw(wxGrid& grid, dc.DrawEllipse(rect); } - // ---------------------------------------------------------------------------- -// BigGridFrame and BigGridTable: Sample of a non-standard table +// 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 @@ -714,7 +988,7 @@ enum Severity Sev_Max }; -static const wxChar* severities[] = +static const wxString severities[] = { _T("wishlist"), _T("minor"), @@ -726,10 +1000,10 @@ static const wxChar* severities[] = static struct BugsGridData { int id; - const wxChar *summary; + wxChar summary[80]; Severity severity; int prio; - const wxChar *platform; + wxChar platform[12]; bool opened; } gs_dataBugsGrid [] = { @@ -749,6 +1023,10 @@ static const wxChar *headers[Col_Max] = _T("Opened?"), }; +// ---------------------------------------------------------------------------- +// BugsGridTable +// ---------------------------------------------------------------------------- + wxString BugsGridTable::GetTypeName(int WXUNUSED(row), int col) { switch ( col ) @@ -761,8 +1039,10 @@ wxString BugsGridTable::GetTypeName(int WXUNUSED(row), int col) // fall thorugh (TODO should be a list) case Col_Summary: + return wxString::Format(_T("%s:80"), wxGRID_VALUE_STRING); + case Col_Platform: - return wxGRID_VALUE_STRING; + return wxString::Format(_T("%s:all,MSW,GTK,other"), wxGRID_VALUE_CHOICE); case Col_Opened: return wxGRID_VALUE_BOOL; @@ -773,12 +1053,12 @@ wxString BugsGridTable::GetTypeName(int WXUNUSED(row), int col) return wxEmptyString; } -long BugsGridTable::GetNumberRows() +int BugsGridTable::GetNumberRows() { return WXSIZEOF(gs_dataBugsGrid); } -long BugsGridTable::GetNumberCols() +int BugsGridTable::GetNumberCols() { return Col_Max; } @@ -844,13 +1124,14 @@ void BugsGridTable::SetValue( int row, int col, const wxString& value ) gd.severity = Sev_Normal; } } + break; case Col_Summary: - gd.summary = value; + wxStrncpy(gd.summary, value, WXSIZEOF(gd.summary)); break; case Col_Platform: - gd.platform = value; + wxStrncpy(gd.platform, value, WXSIZEOF(gd.platform)); break; } } @@ -951,12 +1232,17 @@ 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, @@ -972,5 +1258,10 @@ BugsGridFrame::BugsGridFrame() grid->SetColAttr(Col_Priority, attrRangeEditor); grid->SetColAttr(Col_Severity, attrCombo); - grid->AutoSizeColumns(); + grid->SetMargins(0, 0); + + grid->Fit(); + SetClientSize(grid->GetSize()); } + +