X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..03dede4dc15796ab5e3e49ef597ebbc461227bca:/interface/wx/docmdi.h diff --git a/interface/wx/docmdi.h b/interface/wx/docmdi.h index 68834c2c9f..82289a28da 100644 --- 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$ -// 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 wxString& name = "frame"); + const wxString& name = wxFrameNameStr); //@} /** Destructor. */ - ~wxDocMDIParentFrame(); + virtual ~wxDocMDIParentFrame(); /** Creates the window. @@ -51,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 @@ -100,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. @@ -127,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.