X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae3c17b4013e80b99976c750c19fca47729517f6..071de7a097edd90a8f39d4624b26b5744560e677:/interface/wx/docmdi.h diff --git a/interface/wx/docmdi.h b/interface/wx/docmdi.h index 758fba89b6..a5688dc186 100644 --- a/interface/wx/docmdi.h +++ b/interface/wx/docmdi.h @@ -8,7 +8,6 @@ /** @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 @@ -36,13 +35,13 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); //@} /** Destructor. */ - ~wxDocMDIParentFrame(); + virtual ~wxDocMDIParentFrame(); /** Creates the window. @@ -52,7 +51,7 @@ public: 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 @@ -80,7 +79,6 @@ public: /** @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 @@ -102,17 +100,17 @@ public: 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& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. */ - ~wxDocMDIChildFrame(); + virtual ~wxDocMDIChildFrame(); /** 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. */ - void OnActivate(wxActivateEvent event); + void OnActivate(wxActivateEvent& event); /** Closes and deletes the current view and document.