Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxDocMDIParentFrame needs a default constructor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-05-11 14:35:51 +00:00
parent f83b67612b
commit f0003d294a
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/docmdi.h
View File

@@ -30,10 +30,15 @@
class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
{ {
public: public:
wxDocMDIParentFrame();
wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
const wxString& title, const wxPoint& pos = wxDefaultPosition, 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 = wxT("frame"));
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"));
// Extend event processing to search the document manager's event table // Extend event processing to search the document manager's event table
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event);
@@ -44,6 +49,7 @@ public:
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);
protected: protected:
void Init();
wxDocManager *m_docManager; wxDocManager *m_docManager;
private: private:

36
src/common/docmdi.cpp
View File

@@ -36,11 +36,23 @@ BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame)
EVT_CLOSE(wxDocMDIParentFrame::OnCloseWindow) EVT_CLOSE(wxDocMDIParentFrame::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, wxDocMDIParentFrame::wxDocMDIParentFrame()
const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxMDIParentFrame(frame, id, title, pos, size, style, name)
{ {
m_docManager = manager; Init();
}
wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size, long style, const wxString& name)
{
Init();
Create(manager, frame, id, title, pos, size, style, name);
}
bool wxDocMDIParentFrame::Create(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size, long style, const wxString& name)
{
m_docManager = manager;
return wxMDIParentFrame::Create(frame, id, title, pos, size, style, name);
} }
void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
@@ -48,6 +60,11 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
Close(); Close();
} }
void wxDocMDIParentFrame::Init()
{
m_docManager = NULL;
}
void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event) void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
{ {
wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1)); wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1));
@@ -108,11 +125,12 @@ wxDocMDIChildFrame::wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParen
bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name) const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
{ {
m_childDocument = doc; m_childDocument = doc;
m_childView = view; m_childView = view;
if (wxMDIChildFrame::Create(frame, id, title, pos, size, style, name)) { if (wxMDIChildFrame::Create(frame, id, title, pos, size, style, name))
if (view) {
view->SetFrame(this); if (view)
view->SetFrame(this);
return TRUE; return TRUE;
} }