X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16553659df1a8fee8b19cc9a8ff8321711fe983c..cc03361d7a5602858798202bc5eaaaf4775837d2:/samples/forty/canvas.cpp

diff --git a/samples/forty/canvas.cpp b/samples/forty/canvas.cpp
index 7a5dfe4010..384d2bebbe 100644
--- a/samples/forty/canvas.cpp
+++ b/samples/forty/canvas.cpp
@@ -51,7 +51,6 @@ FortyCanvas::FortyCanvas(wxWindow* parent, int x, int y, int w, int h) :
 	m_font = wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
 #endif
 	SetBackgroundColour(FortyApp::BackgroundColour());
-	AllowDoubleClick(true);
 
 	m_handCursor = new wxCursor(wxCURSOR_HAND);
 	m_arrowCursor = new wxCursor(wxCURSOR_ARROW);
@@ -98,7 +97,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
 	// then ask the player for their name
 	if (m_player.Length() == 0 && !m_playerDialog)
 	{
-		m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
+ 		m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
 		m_playerDialog->ShowModal();
 		m_player = m_playerDialog->GetPlayersName();
 		if (m_player.Length() > 0)
@@ -108,7 +107,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
 			m_scoreFile->ReadPlayersScore(m_player, wins, games, score);
 			m_game->NewPlayer(wins, games, score);
 			m_game->DisplayScore(dc);
-			delete m_playerDialog;
+			m_playerDialog->Destroy();
 			m_playerDialog = 0;
 			Refresh();
 		}
@@ -123,13 +122,13 @@ void FortyCanvas::OnDraw(wxDC& dc)
 /*
 Called when the main frame is closed
 */
-bool FortyCanvas::OnClose()
+bool FortyCanvas::OnCloseCanvas()
 {
 	if (m_game->InPlay() &&
 		wxMessageBox("Are you sure you want to\nabandon the current game?",
 			"Warning", wxYES_NO | wxICON_QUESTION) == wxNO)
 	{
-		return FALSE;
+        return FALSE;
 	}
 	return TRUE;
 }