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 705e949612a971894c43ac598a35b4b0d4885466..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();
-       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;
 }
 
 
@@ -92,7 +94,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
 {
        dc.SetFont(* m_font);
        m_game->Redraw(dc);
-
+#if 0
        // if player name not set (and selection dialog is not displayed)
        // then ask the player for their name
        if (m_player.Length() == 0 && !m_playerDialog)
@@ -117,16 +119,48 @@ void FortyCanvas::OnDraw(wxDC& dc)
                        ((wxFrame*)GetParent())->Close(TRUE);
                }
        }
+#endif
 }
 
+void FortyCanvas::ShowPlayerDialog()
+{
+       // if player name not set (and selection dialog is not displayed)
+       // then ask the player for their name
+       if (m_player.Length() == 0 && !m_playerDialog)
+       {
+               m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
+               m_playerDialog->ShowModal();
+               m_player = m_playerDialog->GetPlayersName();
+               if (m_player.Length() > 0)
+               {
+                       // user entered a name - lookup their score
+                       int wins, games, score;
+                       m_scoreFile->ReadPlayersScore(m_player, wins, games, score);
+                       m_game->NewPlayer(wins, games, score);
+                        
+                        wxClientDC dc(this);
+                        dc.SetFont(* m_font);
+                       m_game->DisplayScore(dc);
+                       m_playerDialog->Destroy();
+                       m_playerDialog = 0;
+                        Refresh(false);
+               }
+               else
+               {
+                       // user cancelled the dialog - exit the app
+                       ((wxFrame*)GetParent())->Close(TRUE);
+               }
+        }
+}
+        
 /*
 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;
        }