X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb0cbea4423bd4ce43943b1c2d1ff78584734c3..4ae3fe39529688ffc016b2059321720d8bde7064:/demos/forty/forty.h diff --git a/demos/forty/forty.h b/demos/forty/forty.h index d3a24d8cff..e1e9eb7e75 100644 --- 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