X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3039ade95dbad1ee5a5ed03c25e3ed9241907850:/include/wx/docmdi.h diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index af8543afa4..628b685543 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -23,20 +23,17 @@ * Use this instead of wxMDIParentFrame */ -class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame +class WXDLLIMPEXP_CORE wxDocMDIParentFrame: public wxMDIParentFrame { 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")); - - // Extend event processing to search the document manager's event table - virtual bool ProcessEvent(wxEvent& event); + const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); wxDocManager *GetDocumentManager(void) const { return m_docManager; } @@ -46,6 +43,9 @@ public: protected: void Init(); + + virtual bool TryValidator(wxEvent& event); + wxDocManager *m_docManager; private: @@ -58,14 +58,14 @@ private: * Use this instead of wxMDIChildFrame */ -class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame +class WXDLLIMPEXP_CORE wxDocMDIChildFrame: public wxMDIChildFrame { 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")); - ~wxDocMDIChildFrame(); + long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); + virtual ~wxDocMDIChildFrame(); bool Create(wxDocument *doc, wxView *view, @@ -77,9 +77,6 @@ public: long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - // Extend event processing to search the view's event table - virtual bool ProcessEvent(wxEvent& event); - void OnActivate(wxActivateEvent& event); void OnCloseWindow(wxCloseEvent& event); @@ -91,6 +88,9 @@ public: protected: void Init(); + + virtual bool TryValidator(wxEvent& event); + wxDocument* m_childDocument; wxView* m_childView;