X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6d7030871f1376e727902c93f5537165a305e08..3c2f3a60d1e8e825075f40b65f612ff1853a6773:/samples/sashtest/sashtest.h?ds=sidebyside diff --git a/samples/sashtest/sashtest.h b/samples/sashtest/sashtest.h index ed5fa54197..d0d04cf838 100644 --- a/samples/sashtest/sashtest.h +++ b/samples/sashtest/sashtest.h @@ -6,10 +6,10 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include +#include "wx/toolbar.h" // Define a new application class MyApp: public wxApp @@ -35,7 +35,6 @@ class MyFrame: public wxMDIParentFrame MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style); - bool OnClose(void); void OnSize(wxSizeEvent& event); void OnAbout(wxCommandEvent& event); void OnNewWindow(wxCommandEvent& event); @@ -58,18 +57,17 @@ class MyChild: public wxMDIChildFrame MyCanvas *canvas; MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style); ~MyChild(void); - bool OnClose(void); void OnActivate(wxActivateEvent& event); void OnQuit(wxCommandEvent& event); DECLARE_EVENT_TABLE() }; -#define SASHTEST_QUIT 1 +#define SASHTEST_QUIT wxID_EXIT #define SASHTEST_NEW_WINDOW 2 #define SASHTEST_REFRESH 3 #define SASHTEST_CHILD_QUIT 4 -#define SASHTEST_ABOUT 5 +#define SASHTEST_ABOUT wxID_ABOUT #define SASHTEST_TOGGLE_WINDOW 6 #define ID_WINDOW_TOP 100