No changes, just use "@since 3.0" consistently in the documentation.

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

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 30eb0fe3945564c250ca1bda1b511160bae15a17..95de6ba6bfdb379b9bf0f79968224d5f6d1a5c9e 100644 (file)
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -4,18 +4,12 @@
 // Author:      Chris Breeze
 // Modified by:
 // Created:     21/07/97
-// RCS-ID:      $Id$
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:     wxWindows licence
 //---------------------------------------------------------------------------
 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -39,12 +33,14 @@ BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
-             wxScrolledWindow(parent, wxID_ANY, pos, size),
+             wxScrolledWindow(parent, wxID_ANY, pos, size, 0),
              m_helpingHand(true),
              m_rightBtnUndo(true),
              m_playerDialog(0),
              m_leftBtnDown(false)
 {
+    SetScrollbars(0, 0, 0, 0);
+
 #ifdef __WXGTK__
     m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
 #else
@@ -56,7 +52,7 @@ FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& siz
     m_arrowCursor = new wxCursor(wxCURSOR_ARROW);
 
     wxString name = wxTheApp->GetAppName();
-    if (name.Length() <= 0) name = _T("forty");
+    if ( name.empty() ) name = wxT("forty");
     m_scoreFile = new ScoreFile(name);
     m_game = new Game(0, 0, 0);
     m_game->Deal();
@@ -78,7 +74,7 @@ Write the current player's score back to the score file
 */
 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,
@@ -97,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 (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();
-        if (m_player.Length() > 0)
+        if ( !m_player.empty() )
         {
             // user entered a name - lookup their score
             int wins, games, score;
@@ -126,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 (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();
-        if (m_player.Length() > 0)
+        if ( !m_player.empty() )
         {
             // user entered a name - lookup their score
             int wins, games, score;
@@ -159,8 +155,8 @@ Called when the main frame is closed
 bool FortyCanvas::OnCloseCanvas()
 {
     if (m_game->InPlay() &&
-        wxMessageBox(_T("Are you sure you want to\nabandon the current game?"),
-            _T("Warning"), wxYES_NO | wxICON_QUESTION) == wxNO)
+        wxMessageBox(wxT("Are you sure you want to\nabandon the current game?"),
+            wxT("Warning"), wxYES_NO | wxICON_QUESTION) == wxNO)
     {
         return false;
     }