#endif
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+ #include "wx/wx.h"
#endif
#include "wx/colordlg.h"
+#include "wx/fontdlg.h"
#include "wx/grid.h"
+#include "wx/generic/gridctrl.h"
#include "griddemo.h"
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_SETLABEL_FONT, GridFrame::SetLabelFont )
EVT_MENU( ID_ROWLABELHORIZALIGN, GridFrame::SetRowLabelHorizAlignment )
EVT_MENU( ID_ROWLABELVERTALIGN, GridFrame::SetRowLabelVertAlignment )
EVT_MENU( ID_COLLABELHORIZALIGN, GridFrame::SetColLabelHorizAlignment )
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_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 )
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;
colLabelMenu->Append( ID_COLLABELVERTALIGN, "&Vertical" );
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" );
+ colMenu->Append( ID_SETLABELCOLOUR, "Set &label colour..." );
+ colMenu->Append( ID_SETLABELTEXTCOLOUR, "Set label &text colour..." );
+ colMenu->Append( ID_SETLABEL_FONT, "Set label fo&nt..." );
+ 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_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" );
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 ),
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, 4, "Can veto edit this cell" );
grid->SetCellValue( 0, 5, "Press\nCtrl+arrow\nto skip over\ncells" );
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);
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->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->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,
GetMenuBar()->Check( ID_TOGGLEROWSIZING, TRUE );
GetMenuBar()->Check( ID_TOGGLECOLSIZING, TRUE );
GetMenuBar()->Check( ID_TOGGLEGRIDSIZING, TRUE );
+ GetMenuBar()->Check( ID_TOGGLEGRIDLINES, TRUE );
}
}
+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::SetLabelFont( wxCommandEvent& WXUNUSED(ev) )
+{
+ wxFont font = wxGetFontFromUser(this);
+ if ( font.Ok() )
+ {
+ grid->SetLabelFont(font);
+ }
+}
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;
}
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;
}
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;
}
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;
}
{
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();
}
}
{
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();
}
}
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);
}
}
+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.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
//
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.)
{
logBuf = "";
logBuf << "Resized row " << ev.GetRowOrCol();
- wxLogMessage( "%s", logBuf.c_str() );
+ wxLogMessage( wxT("%s"), logBuf.c_str() );
ev.Skip();
}
{
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 = "";
- 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
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();
}
<< " row " << ev.GetRow()
<< " col " << ev.GetCol();
- wxLogMessage( "%s", logBuf.c_str() );
+ wxLogMessage( wxT("%s"), logBuf.c_str() );
ev.Skip();
}
void GridFrame::OnEditorShown( wxGridEvent& ev )
{
- wxLogMessage( "Cell editor shown." );
+
+ 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 )
{
- wxLogMessage( "Cell editor hidden." );
+
+ 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();
}
frame->Show(TRUE);
}
+
void GridFrame::OnVTable(wxCommandEvent& )
{
static long s_sizeGrid = 10000;
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 )
{
Sev_Max
};
-static const wxChar* severities[] =
+static const wxString severities[] =
{
_T("wishlist"),
_T("minor"),
static struct BugsGridData
{
int id;
-
- // Borland can't deal with global wxStrings and will generate a
- // compile time error with the initializing the gs_dataGridBugs
- // array (below)
- //
-#ifndef __BORLANDC__
- wxString summary;
-#else
- wxChar *summary;
-#endif
-
+ wxChar summary[80];
Severity severity;
int prio;
-
-#ifndef __BORLANDC__
- wxString platform;
-#else
- wxChar *platform;
-#endif
-
+ wxChar platform[12];
bool opened;
} gs_dataBugsGrid [] =
{
return wxEmptyString;
}
-long BugsGridTable::GetNumberRows()
+int BugsGridTable::GetNumberRows()
{
return WXSIZEOF(gs_dataBugsGrid);
}
-long BugsGridTable::GetNumberCols()
+int BugsGridTable::GetNumberCols()
{
return Col_Max;
}
break;
case Col_Summary:
-#ifndef __BORLANDC__
- gd.summary = value;
-#else
- // this generates a warning message if you are using the
- // memory tracing code but it should be ok :MB
- //
- delete gd.summary;
- gd.summary = copystring( value.c_str() );
-#endif
+ wxStrncpy(gd.summary, value, WXSIZEOF(gd.summary));
break;
case Col_Platform:
-#ifndef __BORLANDC__
- gd.platform = value;
-#else
- // this generates a warning message if you are using the
- // memory tracing code but it should be ok :MB
- //
- delete gd.platform;
- gd.platform = copystring( value.c_str() );
-#endif
+ wxStrncpy(gd.platform, value, WXSIZEOF(gd.platform));
break;
}
}
grid->SetMargins(0, 0);
grid->Fit();
- wxSize size = grid->GetSize();
- size.x += 10;
- size.y += 10;
- SetClientSize(size);
+ SetClientSize(grid->GetSize());
}
+
+
projects / wxWidgets.git / blobdiff