Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

[wxWidgets.git] / include / wx / docmdi.h

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 6f7db58da565e5815c4fb4b849e5f49982bfda47..a94a48c73dda2ecb18d46ac7c52bfdc16cf2c73a 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "docmdi.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_MDI_ARCHITECTURE
 #include "wx/defs.h"
 
 #if wxUSE_MDI_ARCHITECTURE


@@ -27,7 +23,7 @@
  * Use this instead of wxMDIParentFrame
  */
 
  * Use this instead of wxMDIParentFrame
  */
 

-class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
+class WXDLLIMPEXP_CORE wxDocMDIParentFrame: public wxMDIParentFrame

 {
 public:
     wxDocMDIParentFrame();
 {
 public:
     wxDocMDIParentFrame();


@@ -62,14 +58,14 @@ private:
  * Use this instead of wxMDIChildFrame
  */
 
  * Use this instead of wxMDIChildFrame
  */
 

-class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
+class WXDLLIMPEXP_CORE wxDocMDIChildFrame: public wxMDIChildFrame

 {
 public:
     wxDocMDIChildFrame();
     wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
         long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
 {
 public:
     wxDocMDIChildFrame();
     wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
         long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));

-    ~wxDocMDIChildFrame();
+    virtual ~wxDocMDIChildFrame();

 
     bool Create(wxDocument *doc,
                 wxView *view,
 
     bool Create(wxDocument *doc,
                 wxView *view,