DP: native wxTreeCtrl for GTK.

[wxWidgets.git] / include / wx / docview.h

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 087153946c4ce5c1683b64421e74ab4fb8845b74..add8ef0e19b90a7b1f4287f2e229c4ed80fe36d2 100644 (file)
--- 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);
 
   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);
   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);
   // 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; }
 
 
   virtual inline wxList& GetDocuments(void) const { return (wxList&) m_docs; }
 


@@ -355,7 +355,7 @@ class WXDLLEXPORT wxDocChildFrame: public wxFrame
   DECLARE_CLASS(wxDocChildFrame)
 
  public:
   DECLARE_CLASS(wxDocChildFrame)
 
  public:

-  wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title,
+  wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, wxWindowID id, const wxString& title,

     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxDocChildFrame(void);
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxDocChildFrame(void);


@@ -387,7 +387,7 @@ class WXDLLEXPORT wxDocParentFrame: public wxFrame
 {
   DECLARE_CLASS(wxDocParentFrame)
  public:
 {
   DECLARE_CLASS(wxDocParentFrame)
  public:

-  wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
+  wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,

     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long type = wxDEFAULT_FRAME, const wxString& name = "frame");
 
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long type = wxDEFAULT_FRAME, const wxString& name = "frame");