Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index 89490a2af863b7bccb34d02076062dd715d623c7..4d84f6cf494290eaed91465ae161b6778fc0f731 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/toolbar.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/toolbar.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, const wxPoint& pos, const wxSize& size, const long style);
-    ~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,39 @@ 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;
+
+    // simple test event handler class
+    class EventHandler : public wxEvtHandler
+    {
+    public:
+        EventHandler(unsigned numChild) : m_numChild(numChild) { }
+
+    private:
+        void OnRefresh(wxCommandEvent& event)
+        {
+            wxLogMessage("Child #%u refreshed.", m_numChild);
+            event.Skip();
+        }
+
+        const unsigned m_numChild;
+
+        DECLARE_EVENT_TABLE()
+
+        wxDECLARE_NO_COPY_CLASS(EventHandler);
+    };

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


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

-    MDI_QUIT = 100,
-    MDI_NEW_WINDOW,
+    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
+    MDI_CHANGE_SIZE

 };
 };