renamed wxComboControl to wxComboCtrl and related wxUSE_XXX and configure switches...

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

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 013576c088f3f3d8164a27463bed29e8e7cf8eed..e2356e184aa1df6f8147a0ed118e135835828953 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"
 


@@ -137,7 +132,7 @@ void FortyCanvas::ShowPlayerDialog()
             int wins, games, score;
             m_scoreFile->ReadPlayersScore(m_player, wins, games, score);
             m_game->NewPlayer(wins, games, 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,7 +147,7 @@ void FortyCanvas::ShowPlayerDialog()
         }
     }
 }
         }
     }
 }

-        
+

 /*
 Called when the main frame is closed
 */
 /*
 Called when the main frame is closed
 */


@@ -172,7 +167,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 +228,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 +248,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 +256,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);