X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/docmdi.h diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index 5c1670c250..e105fdcd50 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -5,17 +5,13 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) -// Licence: wxWidgets licence +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DOCMDI_H_ #define _WX_DOCMDI_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "docmdi.h" -#endif - #include "wx/defs.h" #if wxUSE_MDI_ARCHITECTURE @@ -27,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; } @@ -50,26 +43,29 @@ public: protected: void Init(); + + virtual bool TryValidator(wxEvent& event); + wxDocManager *m_docManager; private: DECLARE_CLASS(wxDocMDIParentFrame) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDocMDIParentFrame) + wxDECLARE_NO_COPY_CLASS(wxDocMDIParentFrame); }; /* * 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, @@ -81,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,17 +84,20 @@ 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(); + + virtual bool TryValidator(wxEvent& event); + wxDocument* m_childDocument; wxView* m_childView; private: DECLARE_EVENT_TABLE() DECLARE_CLASS(wxDocMDIChildFrame) - DECLARE_NO_COPY_CLASS(wxDocMDIChildFrame) + wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame); }; #endif