using scan-line polygon conversion for constructing wxregion

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

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 7a8e5fa384ad98e8049aeac228b8e6b5c4c94a2f..7667fb43bad30b4eb6217137464de66652f67d5e 100644 (file)
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -41,7 +41,6 @@ FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& siz
              m_leftBtnDown(false)
 {
     SetScrollbars(0, 0, 0, 0);
              m_leftBtnDown(false)
 {
     SetScrollbars(0, 0, 0, 0);

-    SetMinSize(wxSize(10,10));

 
 #ifdef __WXGTK__
     m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
 
 #ifdef __WXGTK__
     m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);


@@ -54,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();


@@ -76,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,


@@ -95,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;


@@ -124,12 +123,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;


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