update for bakefile 0.2.6

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

diff --git a/interface/wx/docmdi.h b/interface/wx/docmdi.h
index 758fba89b64aeb61f5b2e1d27a0b8730e4cf7056..a5688dc186020bf190548e52c889aa78dbdd0ffa 100644 (file)
--- a/interface/wx/docmdi.h
+++ b/interface/wx/docmdi.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxDocMDIParentFrame
 
 /**
     @class wxDocMDIParentFrame

-    @wxheader{docmdi.h}

 
     The wxDocMDIParentFrame class provides a default top-level frame for
     applications using the document/view framework. This class can only be used
 
     The wxDocMDIParentFrame class provides a default top-level frame for
     applications using the document/view framework. This class can only be used


@@ -36,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.


@@ -52,7 +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");
+                const wxString& name = wxFrameNameStr);

 
     /**
         Deletes all views and documents. If no user input cancelled the
 
     /**
         Deletes all views and documents. If no user input cancelled the


@@ -80,7 +79,6 @@ public:
 
 /**
     @class wxDocMDIChildFrame
 
 /**
     @class wxDocMDIChildFrame

-    @wxheader{docmdi.h}

 
     The wxDocMDIChildFrame class provides a default frame for displaying
     documents on separate windows. This class can only be used for MDI child
 
     The wxDocMDIChildFrame class provides a default frame for displaying
     documents on separate windows. This class can only be used for MDI child


@@ -102,17 +100,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.


@@ -129,7 +127,7 @@ public:
         to override (but still call) this function in order to set the keyboard
         focus for your subwindow.
     */
         to override (but still call) this function in order to set the keyboard
         focus for your subwindow.
     */

-    void OnActivate(wxActivateEvent event);
+    void OnActivate(wxActivateEvent& event);

 
     /**
         Closes and deletes the current view and document.
 
     /**
         Closes and deletes the current view and document.