X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d2ac6b8c652a4aac703ba03f143820e978b33d4..84fc95da58864be4b0558cc0da99f51901a990b8:/demos/forty/scoredg.cpp diff --git a/demos/forty/scoredg.cpp b/demos/forty/scoredg.cpp index dce78ba2ab..b12e16f2c2 100644 --- a/demos/forty/scoredg.cpp +++ b/demos/forty/scoredg.cpp @@ -9,11 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma implementation -#pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -161,17 +156,17 @@ ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) : average = (2 * score + games) / (2 * games); } list->SetCellValue(i,0,players[i]); - string_value.Printf( _T("%u"), wins ); + string_value.Printf( wxT("%u"), wins ); list->SetCellValue(i,1,string_value); - string_value.Printf( _T("%u"), games ); + string_value.Printf( wxT("%u"), games ); list->SetCellValue(i,2,string_value); - string_value.Printf( _T("%u"), average ); + string_value.Printf( wxT("%u"), average ); list->SetCellValue(i,3,string_value); } - list->SetColLabelValue(0, _T("Players")); - list->SetColLabelValue(1, _T("Wins")); - list->SetColLabelValue(2, _T("Games")); - list->SetColLabelValue(3, _T("Score")); + list->SetColLabelValue(0, wxT("Players")); + list->SetColLabelValue(1, wxT("Wins")); + list->SetColLabelValue(2, wxT("Games")); + list->SetColLabelValue(3, wxT("Score")); list->SetEditable(false); list->AutoSizeColumns(); list->AutoSizeRows(); @@ -186,7 +181,7 @@ ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) : ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile, wxDefaultPosition, sz); #endif - list->SetBestFittingSize(sz); + list->SetInitialSize(sz); // locate and resize with sizers wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );