remove wxNewEventFunctor() overload which allowed calls to "Bind(evt, &WrongClass...

[wxWidgets.git] / samples / docview / doc.h

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index a4547ec65fe5df42f994df7c21b9f0cb17d29e7b..8365009d5cde04a245451558c2d32f72e007dc6f 100644 (file)
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -157,22 +157,37 @@ public:
 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------

-// A simple text document class
+// wxTextDocument: wxDocument and wxTextCtrl married

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class TextEditView;
-class TextEditDocument : public wxDocument
+class wxTextDocument : public wxDocument

 {
 public:
 {
 public:

-    TextEditDocument() : wxDocument() { }
-    TextEditView *GetFirstView() const;
+    wxTextDocument() : wxDocument() { }
+    virtual wxTextCtrl* GetTextCtrl() const = 0;

 
 

-    virtual bool DoSaveDocument(const wxString& filename);
-    virtual bool DoOpenDocument(const wxString& filename);

     virtual bool IsModified() const;
     virtual void Modify(bool mod);
 
     virtual bool IsModified() const;
     virtual void Modify(bool mod);
 

-    DECLARE_NO_COPY_CLASS(TextEditDocument)
+protected:
+    virtual bool DoSaveDocument(const wxString& filename);
+    virtual bool DoOpenDocument(const wxString& filename);
+
+    wxDECLARE_NO_COPY_CLASS(wxTextDocument);
+    DECLARE_CLASS(wxTextDocument)
+};
+
+// ----------------------------------------------------------------------------
+// A very simple text document class
+// ----------------------------------------------------------------------------
+
+class TextEditDocument : public wxTextDocument
+{
+public:
+    TextEditDocument() : wxTextDocument() { }
+    virtual wxTextCtrl* GetTextCtrl() const;
+
+    wxDECLARE_NO_COPY_CLASS(TextEditDocument);

     DECLARE_DYNAMIC_CLASS(TextEditDocument)
 };
 
     DECLARE_DYNAMIC_CLASS(TextEditDocument)
 };