X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2049ba38adafa0ec146880de29f26e32dd69a125..abefd7eebac853dfc6a9b8939fa6fb8bc5dafcf6:/samples/mdi/mdi.h diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h index 3773699422..3f6b15f51f 100644 --- a/samples/mdi/mdi.h +++ b/samples/mdi/mdi.h @@ -6,85 +6,85 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __WXMSW__ -#ifdef __WIN95__ -#define wxToolBar wxToolBar95 -#else -#define wxToolBar wxToolBarMSW -#endif -#endif +#include "wx/toolbar.h" // Define a new application -class MyApp: public wxApp +class MyApp : public wxApp { - public: - bool OnInit(void); +public: + bool OnInit(); }; -class MyCanvas: public wxScrolledWindow +class MyCanvas : public wxScrolledWindow { - public: +public: MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size); virtual void OnDraw(wxDC& dc); - void OnEvent(wxMouseEvent& event); - DECLARE_EVENT_TABLE() -}; + bool IsDirty() const { return m_dirty; } -#ifdef __WXMSW__ + void OnEvent(wxMouseEvent& event); -class TestRibbon: public wxToolBar -{ - public: - TestRibbon(wxFrame *frame, int x = 0, int y = 0, int w = -1, int h = -1, - long style = wxNO_BORDER, int direction = wxVERTICAL, int RowsOrColumns = 2); - bool OnLeftClick(int toolIndex, bool toggled); - void OnMouseEnter(int toolIndex); - void OnPaint(wxPaintEvent& event); - - DECLARE_EVENT_TABLE() -}; +private: + bool m_dirty; -#endif + DECLARE_EVENT_TABLE() +}; // Define a new frame -class MyFrame: public wxMDIParentFrame +class MyFrame : public wxMDIParentFrame { - public: +public: wxTextCtrl *textWindow; - -#ifdef __WXMSW__ - TestRibbon* toolBar; -#endif - MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style); - bool OnClose(void); + MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, + const wxPoint& pos, const wxSize& size, const long style); + + void InitToolBar(wxToolBar* toolBar); + void OnSize(wxSizeEvent& event); void OnAbout(wxCommandEvent& event); void OnNewWindow(wxCommandEvent& event); void OnQuit(wxCommandEvent& event); + void OnClose(wxCloseEvent& event); -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; class MyChild: public wxMDIChildFrame { - public: +public: MyCanvas *canvas; MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style); - ~MyChild(void); - bool OnClose(void); + ~MyChild(); + void OnActivate(wxActivateEvent& event); + + void OnRefresh(wxCommandEvent& event); + void OnUpdateRefresh(wxUpdateUIEvent& event); + void OnChangeTitle(wxCommandEvent& event); + void OnChangePosition(wxCommandEvent& event); + void OnChangeSize(wxCommandEvent& event); void OnQuit(wxCommandEvent& event); + void OnSize(wxSizeEvent& event); + void OnMove(wxMoveEvent& event); + void OnClose(wxCloseEvent& event); -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; -#define MDI_QUIT 1 -#define MDI_NEW_WINDOW 2 -#define MDI_REFRESH 3 -#define MDI_CHILD_QUIT 4 -#define MDI_ABOUT 5 +// menu items ids +enum +{ + MDI_QUIT = 100, + MDI_NEW_WINDOW, + MDI_REFRESH, + MDI_CHANGE_TITLE, + MDI_CHANGE_POSITION, + MDI_CHANGE_SIZE, + MDI_CHILD_QUIT, + MDI_ABOUT +};