X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..035b704a464852c4d6ce297f20a90551c08d3a4c:/include/wx/docview.h diff --git a/include/wx/docview.h b/include/wx/docview.h index 793049f770..63b3441488 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -283,9 +283,9 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler void OnUndo(wxCommandEvent& event); void OnRedo(wxCommandEvent& event); -#ifdef WXWIN_COMPATIBILITY - virtual wxDocument *CreateDocument(char *WXUNUSED(path), long WXUNUSED(flags = 0)) { return NULL; }; -#endif + // Extend event processing to search the view's event table + virtual bool ProcessEvent(wxEvent& event); + virtual wxDocument *CreateDocument(const wxString& path, long flags = 0); virtual wxView *CreateView(wxDocument *doc, long flags = 0); virtual void DeleteTemplate(wxDocTemplate *temp, long flags = 0); @@ -317,7 +317,7 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler // Views or windows should inform the document manager // when a view is going in or out of focus virtual void ActivateView(wxView *view, bool activate = TRUE, bool deleting = FALSE); - virtual inline wxView *GetCurrentView(void) const { return m_currentView; } + virtual wxView *GetCurrentView(void) const; virtual inline wxList& GetDocuments(void) const { return (wxList&) m_docs; } @@ -357,7 +357,7 @@ class WXDLLEXPORT wxDocChildFrame: public wxFrame public: wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"); + long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"); ~wxDocChildFrame(void); bool OnClose(void); @@ -389,7 +389,7 @@ class WXDLLEXPORT wxDocParentFrame: public wxFrame public: wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long type = wxDEFAULT_FRAME, const wxString& name = "frame"); + long type = wxDEFAULT_FRAME, const wxString& name = "frame"); bool OnClose(void); // Extend event processing to search the document manager's event table