X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bba5e72ad3129a1c5660a7089c50865bc93be1a6..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/docmdi.h diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index b544b46068..828e6a5b6d 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -29,11 +29,11 @@ public: wxDocMDIParentFrame(); wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); + const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); bool Create(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); + const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); wxDocManager *GetDocumentManager(void) const { return m_docManager; } @@ -64,7 +64,7 @@ public: wxDocMDIChildFrame(); wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); + long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); virtual ~wxDocMDIChildFrame(); bool Create(wxDocument *doc, @@ -84,7 +84,7 @@ public: inline wxView *GetView(void) const { return m_childView; } inline void SetDocument(wxDocument *doc) { m_childDocument = doc; } inline void SetView(wxView *view) { m_childView = view; } - bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); } + bool Destroy() { m_childView = NULL; return wxMDIChildFrame::Destroy(); } protected: void Init();