Fix unintialized pointer in wxCommandProcessor when

[wxWidgets.git] / demos / forty / canvas.cpp

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index ef3ae68b825b72f07fe7f9e5da4975e5beeaa25a..995e7cbfbfe1e0eea154a52ccbc05522a50b8a79 100644 (file)
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -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();
        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();
        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;
        UpdateScores();
        delete m_game;
        delete m_scoreFile;

+    delete m_handCursor;
+    delete m_arrowCursor;

 }
 
 
 }
 
 


@@ -157,8 +159,8 @@ Called when the main frame is closed
 bool FortyCanvas::OnCloseCanvas()
 {
        if (m_game->InPlay() &&
 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;
        }