Fix for assert in setting image from file by Jaakko Salli.

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

diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index 0ad38bae0acf7dfa16f269299c49a1299ded0b0e..e1e9eb7e75d503f4a2c13579a019dea29e30d54a 100644 (file)
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.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 _FORTY_H_
 #define _FORTY_H_
@@ -16,52 +16,59 @@
 class FortyApp: public wxApp
 {
 public:
-    FortyApp();
-    ~FortyApp();
-       bool OnInit();
+    FortyApp(){}
+    virtual ~FortyApp();
+    bool OnInit();
 
-       static const wxColour& BackgroundColour();
-       static const wxColour& TextColour();
-       static const wxBrush&  BackgroundBrush();
+    static const wxColour& BackgroundColour();
+    static const wxColour& TextColour();
+    static const wxBrush&  BackgroundBrush();
+    const wxString& GetHelpFile() const { return m_helpFile; }
 
 private:
-       static wxColour* m_backgroundColour;
-       static wxColour* m_textColour;
-       static wxBrush*  m_backgroundBrush;
+    static wxColour* m_backgroundColour;
+    static wxColour* m_textColour;
+    static wxBrush*  m_backgroundBrush;
+    wxString m_helpFile;
 };
 
+DECLARE_APP(FortyApp)
+
 class FortyCanvas;
 class FortyFrame: public wxFrame
 {
 public:
-        FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,bool largecards);
-       virtual ~FortyFrame();
+    FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
+    virtual ~FortyFrame(){};
 
-       void OnCloseWindow(wxCloseEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
 
-       // Menu callbacks
-       void NewGame(wxCommandEvent& event);
-       void Exit(wxCommandEvent& event);
-       void About(wxCommandEvent& event);
-       void Undo(wxCommandEvent& event);
-       void Redo(wxCommandEvent& event);
-       void Scores(wxCommandEvent& event);
-       void ToggleRightButtonUndo(wxCommandEvent& event);
-       void ToggleHelpingHand(wxCommandEvent& event);
-        void ToggleCardSize(wxCommandEvent& event);
+    // Menu callbacks
+    void NewGame(wxCommandEvent& event);
+    void Exit(wxCommandEvent& event);
+    void About(wxCommandEvent& event);
+    void Help(wxCommandEvent& event);
+    void Undo(wxCommandEvent& event);
+    void Redo(wxCommandEvent& event);
+    void Scores(wxCommandEvent& event);
+    void ToggleRightButtonUndo(wxCommandEvent& event);
+    void ToggleHelpingHand(wxCommandEvent& event);
+    void ToggleCardSize(wxCommandEvent& event);
 
-        FortyCanvas* GetCanvas() { return m_canvas; }
+    FortyCanvas* GetCanvas() { return m_canvas; }
 
-       DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 
 private:
-       enum MenuCommands { NEW_GAME = 10, SCORES, EXIT,
-                                               UNDO, REDO,
-                                                RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS,
-                                               ABOUT };
+    enum MenuCommands {
+        SCORES = 10,
+        RIGHT_BUTTON_UNDO,
+        HELPING_HAND,
+        LARGE_CARDS
+    };
 
-       wxMenuBar*              m_menuBar;
-       FortyCanvas*    m_canvas;
+    wxMenuBar* m_menuBar;
+    FortyCanvas* m_canvas;
 };
 
 //----------------------------------------------------------------------------
@@ -76,11 +83,8 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE );
-    
-    bool AddControls(wxWindow* parent);
 
-private:
-    DECLARE_EVENT_TABLE()
+    bool AddControls(wxWindow* parent);
 };
 
 #define ID_ABOUT_HTML_WINDOW    1000