mac cleanup, cgcolor changes

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

diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index d3a24d8cffa8939faeb927cbe312ed94c98209fc..e1e9eb7e75d503f4a2c13579a019dea29e30d54a 100644 (file)
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -16,20 +16,20 @@
 class FortyApp: public wxApp
 {
 public:
-    FortyApp();
-    ~FortyApp();
+    FortyApp(){}
+    virtual ~FortyApp();
     bool OnInit();
 
     static const wxColour& BackgroundColour();
     static const wxColour& TextColour();
     static const wxBrush&  BackgroundBrush();
-    const wxString& GetDir() const { return m_dir; }
+    const wxString& GetHelpFile() const { return m_helpFile; }
 
 private:
     static wxColour* m_backgroundColour;
     static wxColour* m_textColour;
     static wxBrush*  m_backgroundBrush;
-    wxString m_dir;
+    wxString m_helpFile;
 };
 
 DECLARE_APP(FortyApp)
@@ -38,8 +38,8 @@ class FortyCanvas;
 class FortyFrame: public wxFrame
 {
 public:
-  FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
-    virtual ~FortyFrame();
+    FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
+    virtual ~FortyFrame(){};
 
     void OnCloseWindow(wxCloseEvent& event);
 
@@ -60,13 +60,10 @@ public:
     DECLARE_EVENT_TABLE()
 
 private:
-    enum MenuCommands { 
-        NEW_GAME = 10, 
-        SCORES,
-        UNDO, 
-        REDO,
-        RIGHT_BUTTON_UNDO, 
-        HELPING_HAND, 
+    enum MenuCommands {
+        SCORES = 10,
+        RIGHT_BUTTON_UNDO,
+        HELPING_HAND,
         LARGE_CARDS
     };
 
@@ -86,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