make it non mach-o carbon savvy

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

diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index d6d9e3f752e6ed67e910a3371f6cd5f0eb0e62bf..09750b2b583d9498b7f078e968e62038c168f80a 100644 (file)
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -34,7 +34,7 @@ class FortyCanvas;
 class FortyFrame: public wxFrame
 {
 public:
-        FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,bool largecards);
+  FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
        virtual ~FortyFrame();
 
        void OnCloseWindow(wxCloseEvent& event);
@@ -43,6 +43,7 @@ public:
        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);
@@ -55,13 +56,34 @@ public:
        DECLARE_EVENT_TABLE()
 
 private:
-       enum MenuCommands { NEW_GAME = 10, SCORES, EXIT,
+       enum MenuCommands { NEW_GAME = 10, SCORES,
                                                UNDO, REDO,
-                                                RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS,
-                                               ABOUT };
+                        RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS
+                                       };
 
        wxMenuBar*              m_menuBar;
        FortyCanvas*    m_canvas;
 };
 
+//----------------------------------------------------------------------------
+// stAboutDialog
+//----------------------------------------------------------------------------
+
+class FortyAboutDialog: public wxDialog
+{
+public:
+    // constructors and destructors
+    FortyAboutDialog( wxWindow *parent, wxWindowID id, const wxString &title,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxDEFAULT_DIALOG_STYLE );
+    
+    bool AddControls(wxWindow* parent);
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+#define ID_ABOUT_HTML_WINDOW    1000
+
 #endif