Add files necessary to run Expat configure.

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

diff --git a/interface/wx/docmdi.h b/interface/wx/docmdi.h
index 68834c2c9ffbb6e58c2c3bd13e02193fbfc1c03d..4f24041808c90429dd6a317c326fb1e93b94267a 100644 (file)
--- a/interface/wx/docmdi.h
+++ b/interface/wx/docmdi.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxDocMDIParentFrame and wxDocMDIChildFrame
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxDocMDIParentFrame and wxDocMDIChildFrame
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -35,13 +35,13 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,

-                        const wxString& name = "frame");
+                        const wxString& name = wxFrameNameStr);

     //@}
 
     /**
         Destructor.
     */
     //@}
 
     /**
         Destructor.
     */

-    ~wxDocMDIParentFrame();
+    virtual ~wxDocMDIParentFrame();

 
     /**
         Creates the window.
 
     /**
         Creates the window.


@@ -51,28 +51,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,

-                const wxString& name = "frame");
-
-    /**
-        Deletes all views and documents. If no user input cancelled the
-        operation, the frame will be destroyed and the application will exit.
-
-        Since understanding how document/view clean-up takes place can be
-        difficult, the implementation of this function is shown below:
-
-        @code
-        void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)
-        {
-            if (m_docManager->Clear(!event.CanVeto()))
-            {
-                this->Destroy();
-            }
-            else
-                event.Veto();
-        }
-        @endcode
-    */
-    void OnCloseWindow(wxCloseEvent& event);
+                const wxString& name = wxFrameNameStr);

 };
 
 
 };
 
 


@@ -100,17 +79,17 @@ public:
         Constructor.
     */
     wxDocMDIChildFrame(wxDocument* doc, wxView* view,
         Constructor.
     */
     wxDocMDIChildFrame(wxDocument* doc, wxView* view,

-                       wxFrame* parent, wxWindowID id,
+                       wxMDIParentFrame* parent, wxWindowID id,

                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,
                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,

-                       const wxString& name = "frame");
+                       const wxString& name = wxFrameNameStr);

 
     /**
         Destructor.
     */
 
     /**
         Destructor.
     */

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

 
     /**
         Returns the document associated with this frame.
 
     /**
         Returns the document associated with this frame.


@@ -122,18 +101,6 @@ public:
     */
     wxView* GetView() const;
 
     */
     wxView* GetView() const;
 

-    /**
-        Sets the currently active view to be the frame's view. You may need
-        to override (but still call) this function in order to set the keyboard
-        focus for your subwindow.
-    */
-    void OnActivate(wxActivateEvent event);
-
-    /**
-        Closes and deletes the current view and document.
-    */
-    void OnCloseWindow(wxCloseEvent& event);
-

     /**
         Sets the document for this frame.
     */
     /**
         Sets the document for this frame.
     */