Use template class instead of template function in wxVectorSort().

[wxWidgets.git] / samples / mdi / mdi.h

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index d0d6c422e17c87d6cf3c36791de3ee26eb21013d..82a5330c37475e5984f32e82fd79c38de7967072 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -15,7 +15,7 @@
 class MyApp : public wxApp
 {
 public:
 class MyApp : public wxApp
 {
 public:

-    bool OnInit();
+    virtual bool OnInit();

 };
 
 class MyCanvas : public wxScrolledWindow
 };
 
 class MyCanvas : public wxScrolledWindow


@@ -26,9 +26,13 @@ public:
 
     bool IsDirty() const { return m_dirty; }
 
 
     bool IsDirty() const { return m_dirty; }
 

-    void OnEvent(wxMouseEvent& event);
+    void SetText(const wxString& text) { m_text = text; Refresh(); }

 
 private:
 
 private:

+    void OnEvent(wxMouseEvent& event);
+
+    wxString m_text;
+

     bool m_dirty;
 
     DECLARE_EVENT_TABLE()
     bool m_dirty;
 
     DECLARE_EVENT_TABLE()


@@ -38,29 +42,37 @@ private:
 class MyFrame : public wxMDIParentFrame
 {
 public:
 class MyFrame : public wxMDIParentFrame
 {
 public:

-    wxTextCtrl *textWindow;
+    MyFrame();
+    virtual ~MyFrame();

 
 

-    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
-            const wxPoint& pos, const wxSize& size, const long style);
+    static wxMenuBar *CreateMainMenubar();

 
 

+private:

     void InitToolBar(wxToolBar* toolBar);
 
     void OnSize(wxSizeEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnNewWindow(wxCommandEvent& event);
     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 OnQuit(wxCommandEvent& event);

+    void OnCloseAll(wxCommandEvent& event);
+

     void OnClose(wxCloseEvent& event);
 
     void OnClose(wxCloseEvent& event);
 

+    wxTextCtrl *m_textWindow;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class MyChild: public wxMDIChildFrame
+class MyChild : public wxMDIChildFrame

 {
 public:
 {
 public:

-    MyCanvas *canvas;
-    MyChild(wxMDIParentFrame *parent, const wxString& title);
-    ~MyChild();
+    MyChild(wxMDIParentFrame *parent);
+    virtual ~MyChild();

 
 

+    static unsigned GetChildrenCount() { return ms_numChildren; }
+
+private:

     void OnActivate(wxActivateEvent& event);
 
     void OnRefresh(wxCommandEvent& event);
     void OnActivate(wxActivateEvent& event);
 
     void OnRefresh(wxCommandEvent& event);


@@ -68,10 +80,19 @@ public:
     void OnChangeTitle(wxCommandEvent& event);
     void OnChangePosition(wxCommandEvent& event);
     void OnChangeSize(wxCommandEvent& event);
     void OnChangeTitle(wxCommandEvent& event);
     void OnChangePosition(wxCommandEvent& event);
     void OnChangeSize(wxCommandEvent& event);

-    void OnQuit(wxCommandEvent& event);
+    void OnClose(wxCommandEvent& event);

     void OnSize(wxSizeEvent& event);
     void OnMove(wxMoveEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnMove(wxMoveEvent& event);

-    void OnClose(wxCloseEvent& 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()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -79,12 +100,9 @@ public:
 // menu items ids
 enum
 {
 // menu items ids
 enum
 {

-    MDI_QUIT = wxID_EXIT,
-    MDI_NEW_WINDOW = 101,
+    MDI_FULLSCREEN = 100,

     MDI_REFRESH,
     MDI_CHANGE_TITLE,
     MDI_CHANGE_POSITION,
     MDI_REFRESH,
     MDI_CHANGE_TITLE,
     MDI_CHANGE_POSITION,

-    MDI_CHANGE_SIZE,
-    MDI_CHILD_QUIT,
-    MDI_ABOUT = wxID_ABOUT
+    MDI_CHANGE_SIZE

 };
 };