X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/010216e3bc0fc54595d59b6fa4ceec220aff3632..2028c33ab5a39a12bd410ac953731a56ad6377ba:/demos/forty/canvas.cpp

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 013576c088..4fd11dc2fa 100644
--- 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
@@ -56,7 +53,7 @@ FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& siz
     m_arrowCursor = new wxCursor(wxCURSOR_ARROW);
 
     wxString name = wxTheApp->GetAppName();
-    if (name.Length() <= 0) name = _T("forty");
+    if (name.Length() <= 0) name = wxT("forty");
     m_scoreFile = new ScoreFile(name);
     m_game = new Game(0, 0, 0);
     m_game->Deal();
@@ -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,15 +149,15 @@ void FortyCanvas::ShowPlayerDialog()
         }
     }
 }
-        
+
 /*
 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;
     }
@@ -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);