diff --git a/demos/forty/scoredg.cpp b/demos/forty/scoredg.cpp index 60533afbe8..6af72b53e2 100644 --- a/demos/forty/scoredg.cpp +++ b/demos/forty/scoredg.cpp @@ -85,7 +85,7 @@ void ScoreCanvas::OnDraw(wxDC& dc) { dc.SetFont(* m_font); - const wxChar* str = m_text; + const wxChar* str = m_text.c_str(); unsigned int tab = 0; unsigned int tabstops[] = { 5, 100, 150, 200 }; @@ -106,7 +106,7 @@ void ScoreCanvas::OnDraw(wxDC& dc) while (*str && *str >= ' ') *dest++ = *str++; *dest = '\0'; - dc.DrawText(text, tabstops[tab], y); + dc.DrawText(text, FromDIP(tabstops[tab]), y); if (*str == '\t') { @@ -131,8 +131,7 @@ wxEND_EVENT_TABLE() ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) : wxDialog(parent, wxID_ANY, _("Scores"), - wxDefaultPosition, wxSize(400, 300)), - m_scoreFile(file) + wxDefaultPosition, wxSize(400, 300)) { // create grid with players wxArrayString players; @@ -177,7 +176,7 @@ ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) : list->EnableEditing(false); sz.x = wxDefaultCoord; #else - ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile, wxDefaultPosition, sz); + ScoreCanvas* list = new ScoreCanvas(this, file, wxDefaultPosition, sz); #endif list->SetInitialSize(sz); diff --git a/demos/forty/scoredg.h b/demos/forty/scoredg.h index 06a3b69ef4..90e3394c42 100644 --- a/demos/forty/scoredg.h +++ b/demos/forty/scoredg.h @@ -24,9 +24,6 @@ protected: void OnCloseWindow(wxCloseEvent& event); private: - ScoreFile* m_scoreFile; - wxButton* m_OK; - wxDECLARE_EVENT_TABLE(); };