X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e306597309a120f2ae91385c731a5cb2722c52aa..9e96e16fe0bc7af32d329c965ad110a3e5be5ad8:/samples/mdi/mdi.h

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index 08f59a8c7e..82a5330c37 100644
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -5,61 +5,104 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include <wx/toolbar.h>
+#include "wx/toolbar.h"
 
 // Define a new application
-class MyApp: public wxApp
+class MyApp : public wxApp
 {
-  public:
-    bool OnInit(void);
+public:
+    virtual 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);
+
+    bool IsDirty() const { return m_dirty; }
+
+    void SetText(const wxString& text) { m_text = text; Refresh(); }
+
+private:
     void OnEvent(wxMouseEvent& event);
 
+    wxString m_text;
+
+    bool m_dirty;
+
     DECLARE_EVENT_TABLE()
 };
 
 // Define a new frame
-class MyFrame: public wxMDIParentFrame
+class MyFrame : public wxMDIParentFrame
 {
-  public:
-    wxTextCtrl *textWindow;
-    
-    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+public:
+    MyFrame();
+    virtual ~MyFrame();
 
+    static wxMenuBar *CreateMainMenubar();
+
+private:
     void InitToolBar(wxToolBar* toolBar);
 
     void OnSize(wxSizeEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnNewWindow(wxCommandEvent& event);
+    void OnFullScreen(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
+    void OnCloseAll(wxCommandEvent& event);
+
+    void OnClose(wxCloseEvent& event);
+
+    wxTextCtrl *m_textWindow;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-class MyChild: public wxMDIChildFrame
+class MyChild : public wxMDIChildFrame
 {
-  public:
-    MyCanvas *canvas;
-    MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-    ~MyChild(void);
+public:
+    MyChild(wxMDIParentFrame *parent);
+    virtual ~MyChild();
+
+    static unsigned GetChildrenCount() { return ms_numChildren; }
+
+private:
     void OnActivate(wxActivateEvent& event);
-    void OnQuit(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+    void OnRefresh(wxCommandEvent& event);
+    void OnUpdateRefresh(wxUpdateUIEvent& event);
+    void OnChangeTitle(wxCommandEvent& event);
+    void OnChangePosition(wxCommandEvent& event);
+    void OnChangeSize(wxCommandEvent& event);
+    void OnClose(wxCommandEvent& event);
+    void OnSize(wxSizeEvent& event);
+    void OnMove(wxMoveEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
+
+#if wxUSE_CLIPBOARD
+    void OnPaste(wxCommandEvent& event);
+    void OnUpdatePaste(wxUpdateUIEvent& event);
+#endif // wxUSE_CLIPBOARD
+
+    static unsigned ms_numChildren;
+
+    MyCanvas *m_canvas;
+
+    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_FULLSCREEN = 100,
+    MDI_REFRESH,
+    MDI_CHANGE_TITLE,
+    MDI_CHANGE_POSITION,
+    MDI_CHANGE_SIZE
+};