mac cleanup, cgcolor changes

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

diff --git a/demos/forty/canvas.h b/demos/forty/canvas.h
index 60abf5f2d3b46842f67eaf93529efb7b2510ea7a..38396e8d71287b2fc096fe2566d87bc600395c38 100644 (file)
--- a/demos/forty/canvas.h
+++ b/demos/forty/canvas.h
@@ -6,9 +6,9 @@
 // Created:     21/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1993-1998 Chris Breeze
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _CANVAS_H_
 #define _CANVAS_H_
@@ -21,36 +21,38 @@ class PlayerSelectionDialog;
 class FortyCanvas: public wxScrolledWindow
 {
 public:
-       FortyCanvas(wxWindow* parent, int x, int y, int w, int h);
-       virtual ~FortyCanvas();
+    FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size);
+    virtual ~FortyCanvas();
 
-       virtual void OnDraw(wxDC& dc);
-       bool OnCloseCanvas();
-       void OnMouseEvent(wxMouseEvent& event);
-       void SetCursorStyle(int x, int y);
+    virtual void OnDraw(wxDC& dc);
+    bool OnCloseCanvas();
+    void OnMouseEvent(wxMouseEvent& event);
+    void SetCursorStyle(int x, int y);
 
-       void NewGame();
-       void Undo();
-       void Redo();
+    void NewGame();
+    void Undo();
+    void Redo();
 
-       ScoreFile* GetScoreFile() const                 { return m_scoreFile; }
-       void UpdateScores();
-       void EnableHelpingHand(bool enable)             { m_helpingHand = enable; }
-       void EnableRightButtonUndo(bool enable) { m_rightBtnUndo = enable; }
+    ScoreFile* GetScoreFile() const { return m_scoreFile; }
+    void UpdateScores();
+    void EnableHelpingHand(bool enable) { m_helpingHand = enable; }
+    void EnableRightButtonUndo(bool enable) { m_rightBtnUndo = enable; }
+    void LayoutGame();
+    void ShowPlayerDialog();
 
-       DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 
 private:
-       wxFont*         m_font;
-       Game*           m_game;
-       ScoreFile*      m_scoreFile;
-       wxCursor*       m_arrowCursor;
-       wxCursor*       m_handCursor;
-       bool            m_helpingHand;
-       bool            m_rightBtnUndo;
-       wxString        m_player;
-       PlayerSelectionDialog* m_playerDialog;
-       bool            m_leftBtnDown;
+    wxFont* m_font;
+    Game* m_game;
+    ScoreFile* m_scoreFile;
+    wxCursor* m_arrowCursor;
+    wxCursor* m_handCursor;
+    bool m_helpingHand;
+    bool m_rightBtnUndo;
+    wxString m_player;
+    PlayerSelectionDialog* m_playerDialog;
+    bool m_leftBtnDown;
 };
 
 #endif