X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2824cdb7f6ac2371fefd3d44eff62bb48ebc0a3..a70ab3b804b6c363f8bcbed0b4fce94b7fb03612:/interface/wx/mdi.h diff --git a/interface/wx/mdi.h b/interface/wx/mdi.h index 8cf3e594e5..0729f366f5 100644 --- a/interface/wx/mdi.h +++ b/interface/wx/mdi.h @@ -168,7 +168,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. @@ -234,14 +234,14 @@ public: If there are any children at all this function returns a non-@NULL pointer. */ - wxMDIChildFrame* GetActiveChild() const; + virtual wxMDIChildFrame* GetActiveChild() const; /** Returns a pointer to the client window. @see OnCreateClient() */ - wxWindow *GetClientWindow() const; + wxMDIClientWindowBase* GetClientWindow() const; /** Returns the current MDI Window menu. @@ -315,7 +315,7 @@ public: @param menu The menu to be used instead of the standard MDI Window menu or @NULL. */ - void SetWindowMenu(wxMenu *menu); + virtual void SetWindowMenu(wxMenu* menu); /** Tiles the MDI child windows either horizontally or vertically depending @@ -395,7 +395,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. Destroys all child windows and menu bar if present.