X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/868741e9d30e1b62e8ee27614543e8ae820fd15d..9abdd2cb902ca40a25ab84e70155dcf58e92c4e2:/demos/forty/canvas.cpp?ds=sidebyside

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index ef3ae68b82..8a5257d54c 100644
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -38,12 +38,12 @@ BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS(FortyCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 
-FortyCanvas::FortyCanvas(wxWindow* parent, int x, int y, int w, int h) :
-	wxScrolledWindow(parent, -1, wxPoint(x, y), wxSize(w, h)),
-	m_helpingHand(TRUE),
-	m_rightBtnUndo(TRUE),
+FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
+	wxScrolledWindow(parent, wxID_ANY, pos, size),
+	m_helpingHand(true),
+	m_rightBtnUndo(true),
 	m_playerDialog(0),
-	m_leftBtnDown(FALSE)
+	m_leftBtnDown(false)
 {
 #ifdef __WXGTK__
 	m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
@@ -56,7 +56,7 @@ FortyCanvas::FortyCanvas(wxWindow* parent, int x, int y, int w, int h) :
 	m_arrowCursor = new wxCursor(wxCURSOR_ARROW);
 
 	wxString name = wxTheApp->GetAppName();
-	if (name.Length() <= 0) name = "forty";
+	if (name.Length() <= 0) name = _T("forty");
 	m_scoreFile = new ScoreFile(name);
 	m_game = new Game(0, 0, 0);
 	m_game->Deal();
@@ -68,6 +68,8 @@ FortyCanvas::~FortyCanvas()
 	UpdateScores();
 	delete m_game;
 	delete m_scoreFile;
+    delete m_handCursor;
+    delete m_arrowCursor;
 }
 
 
@@ -114,7 +116,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
 		else
 		{
 			// user cancelled the dialog - exit the app
-			((wxFrame*)GetParent())->Close(TRUE);
+			((wxFrame*)GetParent())->Close(true);
 		}
 	}
 #endif
@@ -146,7 +148,7 @@ void FortyCanvas::ShowPlayerDialog()
 		else
 		{
 			// user cancelled the dialog - exit the app
-			((wxFrame*)GetParent())->Close(TRUE);
+			((wxFrame*)GetParent())->Close(true);
 		}
         }
 }
@@ -157,12 +159,12 @@ Called when the main frame is closed
 bool FortyCanvas::OnCloseCanvas()
 {
 	if (m_game->InPlay() &&
-		wxMessageBox("Are you sure you want to\nabandon the current game?",
-			"Warning", wxYES_NO | wxICON_QUESTION) == wxNO)
+		wxMessageBox(_T("Are you sure you want to\nabandon the current game?"),
+			_T("Warning"), wxYES_NO | wxICON_QUESTION) == wxNO)
 	{
-        return FALSE;
+        return false;
 	}
-	return TRUE;
+	return true;
 }
 
 void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
@@ -178,7 +180,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
 	{
 		if (m_leftBtnDown)
 		{
-			m_leftBtnDown = FALSE;
+			m_leftBtnDown = false;
 			ReleaseMouse();
 			m_game->LButtonUp(dc, mouseX, mouseY);
 		}
@@ -188,7 +190,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
 	{
 		if (!m_leftBtnDown)
 		{
-			m_leftBtnDown = TRUE;
+			m_leftBtnDown = true;
 			CaptureMouse();
 			m_game->LButtonDown(dc, mouseX, mouseY);
 		}
@@ -197,14 +199,14 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
 	{
 		if (m_leftBtnDown)
 		{
-			m_leftBtnDown = FALSE;
+			m_leftBtnDown = false;
 			ReleaseMouse();
 			m_game->LButtonUp(dc, mouseX, mouseY);
 		}
 	}
 	else if (event.RightDown() && !event.LeftIsDown())
 	{
-		// only allow right button undo if m_rightBtnUndo is TRUE
+		// only allow right button undo if m_rightBtnUndo is true
 		if (m_rightBtnUndo)
 		{
 			if (event.ControlDown() || event.ShiftDown())