Change version to 3.0.0.

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

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 4fd11dc2fa015fa0b22594e8c301e3e8d45eb87f..95de6ba6bfdb379b9bf0f79968224d5f6d1a5c9e 100644 (file)
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -4,7 +4,6 @@
 // Author:      Chris Breeze
 // Modified by:
 // Created:     21/07/97
 // Author:      Chris Breeze
 // Modified by:
 // Created:     21/07/97

-// RCS-ID:      $Id$

 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:     wxWindows licence
 //---------------------------------------------------------------------------
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:     wxWindows licence
 //---------------------------------------------------------------------------


@@ -53,7 +52,7 @@ FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& siz
     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 = wxT("forty");
+    if ( name.empty() ) name = wxT("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();


@@ -75,7 +74,7 @@ Write the current player's score back to the score file
 */
 void FortyCanvas::UpdateScores()
 {
 */
 void FortyCanvas::UpdateScores()
 {

-    if (m_player.Length() > 0 && m_scoreFile && m_game)
+    if (!m_player.empty() && m_scoreFile && m_game)

     {
         m_scoreFile->WritePlayersScore(
             m_player,
     {
         m_scoreFile->WritePlayersScore(
             m_player,


@@ -94,12 +93,12 @@ void FortyCanvas::OnDraw(wxDC& dc)
 #if 0
     // if player name not set (and selection dialog is not displayed)
     // then ask the player for their name
 #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)
+    if (m_player.empty() && !m_playerDialog)

     {
         m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
         m_playerDialog->ShowModal();
         m_player = m_playerDialog->GetPlayersName();
     {
         m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
         m_playerDialog->ShowModal();
         m_player = m_playerDialog->GetPlayersName();

-        if (m_player.Length() > 0)
+        if ( !m_player.empty() )

         {
             // user entered a name - lookup their score
             int wins, games, score;
         {
             // user entered a name - lookup their score
             int wins, games, score;


@@ -123,12 +122,12 @@ void FortyCanvas::ShowPlayerDialog()
 {
     // if player name not set (and selection dialog is not displayed)
     // then ask the player for their name
 {
     // 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)
+    if (m_player.empty() && !m_playerDialog)

     {
         m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
         m_playerDialog->ShowModal();
         m_player = m_playerDialog->GetPlayersName();
     {
         m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
         m_playerDialog->ShowModal();
         m_player = m_playerDialog->GetPlayersName();

-        if (m_player.Length() > 0)
+        if ( !m_player.empty() )

         {
             // user entered a name - lookup their score
             int wins, games, score;
         {
             // user entered a name - lookup their score
             int wins, games, score;