compilation fix for 2.8 compat disabled

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

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index e7d50b8de11122760ebdbec1a18568085b00d850..2a2966755767525fdade53d144b016b7f16b9ec4 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include <wx/toolbar.h>
+#include "wx/toolbar.h"
 
 // Define a new application
 class MyApp : public wxApp
@@ -28,7 +28,11 @@ public:
 
     void OnEvent(wxMouseEvent& event);
 
+    void SetText(const wxString& text) { m_text = text; Refresh(); }
+
 private:
+    wxString m_text;
+
     bool m_dirty;
 
     DECLARE_EVENT_TABLE()
@@ -58,7 +62,7 @@ class MyChild: public wxMDIChildFrame
 {
 public:
     MyCanvas *canvas;
-    MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+    MyChild(wxMDIParentFrame *parent, const wxString& title);
     ~MyChild();
 
     void OnActivate(wxActivateEvent& event);
@@ -73,18 +77,23 @@ public:
     void OnMove(wxMoveEvent& event);
     void OnClose(wxCloseEvent& event);
 
+#if wxUSE_CLIPBOARD
+    void OnPaste(wxCommandEvent& event);
+    void OnUpdatePaste(wxUpdateUIEvent& event);
+#endif // wxUSE_CLIPBOARD
+
     DECLARE_EVENT_TABLE()
 };
 
 // menu items ids
 enum
 {
-    MDI_QUIT = 100,
-    MDI_NEW_WINDOW,
+    MDI_QUIT = wxID_EXIT,
+    MDI_NEW_WINDOW = 101,
     MDI_REFRESH,
     MDI_CHANGE_TITLE,
     MDI_CHANGE_POSITION,
     MDI_CHANGE_SIZE,
     MDI_CHILD_QUIT,
-    MDI_ABOUT
+    MDI_ABOUT = wxID_ABOUT
 };