Call SetDataSource() from OnEnter() so that querying/accessing the data is possible...

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index e94973701c96514981db222933002d37ef691e3a..828e6a5b6ddacace0fb89757130762c140a7e7df 100644 (file)
--- 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,13 +58,13 @@ 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"));
+        long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr);
     virtual ~wxDocMDIChildFrame();
 
     bool Create(wxDocument *doc,
@@ -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);
 
@@ -87,10 +84,13 @@ 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;