X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f30dcba95deab69e102f4fccb30168539f4cbdfd..36a56c6568bd29350a24f32bf5bbad0532a42a19:/samples/grid/grid.cpp diff --git a/samples/grid/grid.cpp b/samples/grid/grid.cpp index ed7ad8001a..2e1d4544d2 100644 --- a/samples/grid/grid.cpp +++ b/samples/grid/grid.cpp @@ -9,11 +9,6 @@ static const char sccsid[] = "%W% %G%"; -#ifdef __GNUG__ -#pragma implementation -#pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -139,7 +134,7 @@ bool MyApp::OnInit(void) frame->grid->SetCellValue("First cell", 0, 0); frame->grid->SetCellValue("Another cell", 1, 1); frame->grid->SetCellValue("Yet another cell", 2, 2); - frame->grid->SetCellTextFont(* wxTheFontList->FindOrCreateFont(10, wxROMAN, wxITALIC, wxNORMAL), 0, 0); + frame->grid->SetCellTextFont(wxFont(10, wxROMAN, wxITALIC, wxNORMAL), 0, 0); frame->grid->SetCellTextColour(*wxRED, 1, 1); frame->grid->SetCellBackgroundColour(*wxCYAN, 2, 2); if (cellBitmap1 && cellBitmap2) @@ -217,7 +212,7 @@ void MyFrame::ToggleColLabel(wxCommandEvent& WXUNUSED(event)) void MyFrame::ToggleDividers(wxCommandEvent& WXUNUSED(event)) { if (!grid->GetDividerPen().Ok()) - grid->SetDividerPen(* wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID)); + grid->SetDividerPen(wxPen(wxT("LIGHT GREY"), 1, wxSOLID)); else grid->SetDividerPen(wxNullPen); grid->Refresh();