Don't create uneeded variables.

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

diff --git a/demos/forty/game.cpp b/demos/forty/game.cpp
index e03c98373ee5be5afc81a208c2e5867d8e80e4ad..088193e839d686e1c88386df42c22587e2ee10b9 100644 (file)
--- a/demos/forty/game.cpp
+++ b/demos/forty/game.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"
 


@@ -193,7 +188,7 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
 
         if (frame)
         {
 
         if (frame)
         {

-            wxNode *node = (wxNode *)frame->GetChildren().GetFirst();
+            wxWindowList::compatibility_iterator node = frame->GetChildren().GetFirst();

             if (node) canvas = (wxWindow*)node->GetData();
         }
 
             if (node) canvas = (wxWindow*)node->GetData();
         }
 


@@ -861,11 +856,6 @@ bool Base::AcceptCard(Card* card)
     return retval;
 }
 
     return retval;
 }
 

-Base::~Base()
-{
-// nothing special at the moment
-};
-

 
 //----------------------------------------------------------------//
 // The Foundation class: holds the cards built up from the ace... //
 
 //----------------------------------------------------------------//
 // The Foundation class: holds the cards built up from the ace... //


@@ -895,11 +885,6 @@ bool Foundation::AcceptCard(Card* card)
     return retval;
 }
 
     return retval;
 }
 

-Foundation::~Foundation()
-{
-// nothing special at the moment
-};
-

 
 //----------------------------------------------------//
 // The Discard class: holds cards dealt from the m_pack //
 
 //----------------------------------------------------//
 // The Discard class: holds cards dealt from the m_pack //


@@ -981,7 +966,7 @@ Card* Discard::RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset)
 
         for (int i = m_topCard - 31; i <= m_topCard - 31 + CardWidth / m_dx; i++)
         {
 
         for (int i = m_topCard - 31; i <= m_topCard - 31 + CardWidth / m_dx; i++)
         {

-            m_cards[i]->Draw(dc, m_x - m_xOffset + i * m_dx, m_y - m_yOffset); 
+            m_cards[i]->Draw(dc, m_x - m_xOffset + i * m_dx, m_y - m_yOffset);

         }
         if (m_topCard > 31)
         {
         }
         if (m_topCard > 31)
         {


@@ -992,9 +977,3 @@ Card* Discard::RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset)
 
     return card;
 }
 
     return card;
 }

-
-
-Discard::~Discard()
-{
-// nothing special at the moment
-};