Brazilian Portuguese translations update from Felipe.

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

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 013576c088f3f3d8164a27463bed29e8e7cf8eed..7667fb43bad30b4eb6217137464de66652f67d5e 100644 (file)
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -11,11 +11,6 @@
 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -39,12 +34,14 @@ BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
 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)
 {
              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
 #ifdef __WXGTK__
     m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
 #else


@@ -56,7 +53,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 = _T("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();


@@ -78,7 +75,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,


@@ -97,12 +94,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;


@@ -126,18 +123,18 @@ 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;
             m_scoreFile->ReadPlayersScore(m_player, wins, games, score);
             m_game->NewPlayer(wins, games, score);
         {
             // 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);
             wxClientDC dc(this);
             dc.SetFont(* m_font);
             m_game->DisplayScore(dc);


@@ -152,15 +149,15 @@ void FortyCanvas::ShowPlayerDialog()
         }
     }
 }
         }
     }
 }

-        
+

 /*
 Called when the main frame is closed
 */
 bool FortyCanvas::OnCloseCanvas()
 {
     if (m_game->InPlay() &&
 /*
 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;
     }
     {
         return false;
     }


@@ -172,7 +169,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
     int mouseX = (int)event.GetX();
     int mouseY = (int)event.GetY();
 
     int mouseX = (int)event.GetX();
     int mouseY = (int)event.GetY();
 

-    wxClientDC dc(this); 
+    wxClientDC dc(this);

     PrepareDC(dc);
     dc.SetFont(* m_font);
 
     PrepareDC(dc);
     dc.SetFont(* m_font);
 


@@ -233,7 +230,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
 void FortyCanvas::SetCursorStyle(int x, int y)
 {
     // Only set cursor to a hand if 'helping hand' is enabled and
 void FortyCanvas::SetCursorStyle(int x, int y)
 {
     // Only set cursor to a hand if 'helping hand' is enabled and

-    // the card under the cursor can go somewhere 
+    // the card under the cursor can go somewhere

     if (m_game->CanYouGo(x, y) && m_helpingHand)
     {
         SetCursor(* m_handCursor);
     if (m_game->CanYouGo(x, y) && m_helpingHand)
     {
         SetCursor(* m_handCursor);


@@ -253,7 +250,7 @@ void FortyCanvas::NewGame()
 
 void FortyCanvas::Undo()
 {
 
 void FortyCanvas::Undo()
 {

-    wxClientDC dc(this); 
+    wxClientDC dc(this);

     PrepareDC(dc);
     dc.SetFont(* m_font);
     m_game->Undo(dc);
     PrepareDC(dc);
     dc.SetFont(* m_font);
     m_game->Undo(dc);


@@ -261,7 +258,7 @@ void FortyCanvas::Undo()
 
 void FortyCanvas::Redo()
 {
 
 void FortyCanvas::Redo()
 {

-    wxClientDC dc(this); 
+    wxClientDC dc(this);

     PrepareDC(dc);
     dc.SetFont(* m_font);
     m_game->Redo(dc);
     PrepareDC(dc);
     dc.SetFont(* m_font);
     m_game->Redo(dc);