revert r59246; the window parameter was there by purpose (i.e. for consistency with...

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

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 013576c088f3f3d8164a27463bed29e8e7cf8eed..3b1cc178d910e0982b48af5ff7c0cbac2ea38cdb 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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
 // 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) :
-             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
@@ -137,7 +134,7 @@ void FortyCanvas::ShowPlayerDialog()
             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);
@@ -152,7 +149,7 @@ void FortyCanvas::ShowPlayerDialog()
         }
     }
 }
-        
+
 /*
 Called when the main frame is closed
 */
@@ -172,7 +169,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
     int mouseX = (int)event.GetX();
     int mouseY = (int)event.GetY();
 
-    wxClientDC dc(this); 
+    wxClientDC dc(this);
     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
-    // 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);
@@ -253,7 +250,7 @@ void FortyCanvas::NewGame()
 
 void FortyCanvas::Undo()
 {
-    wxClientDC dc(this); 
+    wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(* m_font);
     m_game->Undo(dc);
@@ -261,7 +258,7 @@ void FortyCanvas::Undo()
 
 void FortyCanvas::Redo()
 {
-    wxClientDC dc(this); 
+    wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(* m_font);
     m_game->Redo(dc);