fix memory leak as Dimitri suggested

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 4cd975e70c9b469cece60505fc12841e0c0f915f..8c8bf6fa6f405a8b6773171ca5690480ec02aca8 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -12,11 +12,14 @@
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "docview.h"
 #endif
 
 #include "wx/defs.h"
     #pragma interface "docview.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+

 #include "wx/list.h"
 #include "wx/cmndata.h"
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/cmndata.h"
 #include "wx/string.h"


@@ -37,7 +40,7 @@ class WXDLLEXPORT wxFileHistory;
 class WXDLLEXPORT wxConfigBase;
 
 #if wxUSE_STD_IOSTREAM
 class WXDLLEXPORT wxConfigBase;
 
 #if wxUSE_STD_IOSTREAM

-  #include "wx/ioswrap.h"
+  #include "wx/iosfwrap.h"

 #else
   #include "wx/stream.h"
 #endif
 #else
   #include "wx/stream.h"
 #endif


@@ -64,8 +67,6 @@ enum
 
 class WXDLLEXPORT wxDocument : public wxEvtHandler
 {
 
 class WXDLLEXPORT wxDocument : public wxEvtHandler
 {

-    DECLARE_ABSTRACT_CLASS(wxDocument)
-

 public:
     wxDocument(wxDocument *parent = (wxDocument *) NULL);
     ~wxDocument();
 public:
     wxDocument(wxDocument *parent = (wxDocument *) NULL);
     ~wxDocument();


@@ -133,6 +134,7 @@ public:
     wxView *GetFirstView() const;
 
     virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);
     wxView *GetFirstView() const;
 
     virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);

+    virtual void NotifyClosing();

 
     // Remove all views (because we're closing the document)
     virtual bool DeleteAllViews();
 
     // Remove all views (because we're closing the document)
     virtual bool DeleteAllViews();


@@ -159,30 +161,33 @@ protected:
     wxDocument*           m_documentParent;
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;
     wxDocument*           m_documentParent;
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;

+    
+private:
+    DECLARE_ABSTRACT_CLASS(wxDocument)
+    DECLARE_NO_COPY_CLASS(wxDocument)

 };
 
 class WXDLLEXPORT wxView: public wxEvtHandler
 {
 };
 
 class WXDLLEXPORT wxView: public wxEvtHandler
 {

-    DECLARE_ABSTRACT_CLASS(wxView)
-

 public:
     //  wxView(wxDocument *doc = (wxDocument *) NULL);
     wxView();
     ~wxView();
 
     wxDocument *GetDocument() const { return m_viewDocument; }
 public:
     //  wxView(wxDocument *doc = (wxDocument *) NULL);
     wxView();
     ~wxView();
 
     wxDocument *GetDocument() const { return m_viewDocument; }

-    void SetDocument(wxDocument *doc);
+    virtual void SetDocument(wxDocument *doc);

 
     wxString GetViewName() const { return m_viewTypeName; }
     void SetViewName(const wxString& name) { m_viewTypeName = name; };
 
 
     wxString GetViewName() const { return m_viewTypeName; }
     void SetViewName(const wxString& name) { m_viewTypeName = name; };
 

-    wxFrame *GetFrame() const { return m_viewFrame ; }
-    void SetFrame(wxFrame *frame) { m_viewFrame = frame; }
+    wxWindow *GetFrame() const { return m_viewFrame ; }
+    void SetFrame(wxWindow *frame) { m_viewFrame = frame; }

 
     virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
     virtual void OnDraw(wxDC *dc) = 0;
     virtual void OnPrint(wxDC *dc, wxObject *info);
     virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
 
     virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
     virtual void OnDraw(wxDC *dc) = 0;
     virtual void OnPrint(wxDC *dc, wxObject *info);
     virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);

+    virtual void OnClosingDocument() {};

     virtual void OnChangeFilename();
 
     // Called by framework if created automatically by the default document
     virtual void OnChangeFilename();
 
     // Called by framework if created automatically by the default document


@@ -219,13 +224,16 @@ public:
 protected:
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;
 protected:
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;

-    wxFrame*          m_viewFrame;
+    wxWindow*         m_viewFrame;
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxView)
+    DECLARE_NO_COPY_CLASS(wxView)

 };
 
 // Represents user interface (and other) properties of documents and views
 class WXDLLEXPORT wxDocTemplate: public wxObject
 {
 };
 
 // Represents user interface (and other) properties of documents and views
 class WXDLLEXPORT wxDocTemplate: public wxObject
 {

-DECLARE_CLASS(wxDocTemplate)

 
 friend class WXDLLEXPORT wxDocManager;
 
 
 friend class WXDLLEXPORT wxDocManager;
 


@@ -284,6 +292,10 @@ protected:
     // For dynamic creation of appropriate instances.
     wxClassInfo*      m_docClassInfo;
     wxClassInfo*      m_viewClassInfo;
     // For dynamic creation of appropriate instances.
     wxClassInfo*      m_docClassInfo;
     wxClassInfo*      m_viewClassInfo;

+    
+private:
+    DECLARE_CLASS(wxDocTemplate)
+    DECLARE_NO_COPY_CLASS(wxDocTemplate)

 };
 
 // One object of this class may be created in an application, to manage all
 };
 
 // One object of this class may be created in an application, to manage all


@@ -331,9 +343,6 @@ public:
 
     // called when file format detection didn't work, can be overridden to do
     // something in this case
 
     // called when file format detection didn't work, can be overridden to do
     // something in this case

-    // This is of course completely stupid, because if the file dialog is
-    // cancelled you get an assert. Brilliant. -- JACS
-//    virtual void OnOpenFileFailure() { wxFAIL_MSG(_T("file format mismatch")); }

     virtual void OnOpenFileFailure() { }
 
     virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);
     virtual void OnOpenFileFailure() { }
 
     virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);


@@ -386,9 +395,9 @@ public:
 
     // File history management
     virtual void AddFileToHistory(const wxString& file);
 
     // File history management
     virtual void AddFileToHistory(const wxString& file);

-    virtual void RemoveFileFromHistory(int i);
-    virtual int GetNoHistoryFiles() const;
-    virtual wxString GetHistoryFile(int i) const;
+    virtual void RemoveFileFromHistory(size_t i);
+    virtual size_t GetNoHistoryFiles() const;
+    virtual wxString GetHistoryFile(size_t i) const;

     virtual void FileHistoryUseMenu(wxMenu *menu);
     virtual void FileHistoryRemoveMenu(wxMenu *menu);
 #if wxUSE_CONFIG
     virtual void FileHistoryUseMenu(wxMenu *menu);
     virtual void FileHistoryRemoveMenu(wxMenu *menu);
 #if wxUSE_CONFIG


@@ -417,6 +426,7 @@ protected:
     static wxDocManager* sm_docManager;
 
     DECLARE_EVENT_TABLE()
     static wxDocManager* sm_docManager;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDocManager)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -425,8 +435,6 @@ protected:
 
 class WXDLLEXPORT wxDocChildFrame : public wxFrame
 {
 
 class WXDLLEXPORT wxDocChildFrame : public wxFrame
 {

-    DECLARE_CLASS(wxDocChildFrame)
-

 public:
     wxDocChildFrame(wxDocument *doc,
                     wxView *view,
 public:
     wxDocChildFrame(wxDocument *doc,
                     wxView *view,


@@ -436,7 +444,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long type = wxDEFAULT_FRAME_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long type = wxDEFAULT_FRAME_STYLE,

-                    const wxString& name = "frame");
+                    const wxString& name = wxT("frame"));

     ~wxDocChildFrame();
 
     // Extend event processing to search the view's event table
     ~wxDocChildFrame();
 
     // Extend event processing to search the view's event table


@@ -455,7 +463,10 @@ protected:
     wxDocument*       m_childDocument;
     wxView*           m_childView;
 
     wxDocument*       m_childDocument;
     wxView*           m_childView;
 

+private:
+    DECLARE_CLASS(wxDocChildFrame)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDocChildFrame)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -464,8 +475,6 @@ protected:
 
 class WXDLLEXPORT wxDocParentFrame : public wxFrame
 {
 
 class WXDLLEXPORT wxDocParentFrame : public wxFrame
 {

-    DECLARE_CLASS(wxDocParentFrame)
-

 public:
     wxDocParentFrame(wxDocManager *manager,
                      wxFrame *frame,
 public:
     wxDocParentFrame(wxDocManager *manager,
                      wxFrame *frame,


@@ -474,7 +483,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long type = wxDEFAULT_FRAME_STYLE,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long type = wxDEFAULT_FRAME_STYLE,

-                     const wxString& name = "frame");
+                     const wxString& name = wxT("frame"));

 
     // Extend event processing to search the document manager's event table
     virtual bool ProcessEvent(wxEvent& event);
 
     // Extend event processing to search the document manager's event table
     virtual bool ProcessEvent(wxEvent& event);


@@ -488,7 +497,10 @@ public:
 protected:
     wxDocManager *m_docManager;
 
 protected:
     wxDocManager *m_docManager;
 

+private:
+    DECLARE_CLASS(wxDocParentFrame)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDocParentFrame)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -498,10 +510,8 @@ protected:
 #if wxUSE_PRINTING_ARCHITECTURE
 class WXDLLEXPORT wxDocPrintout : public wxPrintout
 {
 #if wxUSE_PRINTING_ARCHITECTURE
 class WXDLLEXPORT wxDocPrintout : public wxPrintout
 {

-    DECLARE_DYNAMIC_CLASS(wxDocPrintout)
-

 public:
 public:

-    wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = "Printout");
+    wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = wxT("Printout"));

     bool OnPrintPage(int page);
     bool HasPage(int page);
     bool OnBeginDocument(int startPage, int endPage);
     bool OnPrintPage(int page);
     bool HasPage(int page);
     bool OnBeginDocument(int startPage, int endPage);


@@ -511,6 +521,10 @@ public:
 
 protected:
     wxView*       m_printoutView;
 
 protected:
     wxView*       m_printoutView;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDocPrintout)
+    DECLARE_NO_COPY_CLASS(wxDocPrintout)

 };
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 };
 #endif // wxUSE_PRINTING_ARCHITECTURE
 


@@ -520,15 +534,13 @@ protected:
 
 class WXDLLEXPORT wxFileHistory : public wxObject
 {
 
 class WXDLLEXPORT wxFileHistory : public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxFileHistory)
-

 public:
 public:

-    wxFileHistory(int maxFiles = 9);
+    wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);

     ~wxFileHistory();
 
     // Operations
     virtual void AddFileToHistory(const wxString& file);
     ~wxFileHistory();
 
     // Operations
     virtual void AddFileToHistory(const wxString& file);

-    virtual void RemoveFileFromHistory(int i);
+    virtual void RemoveFileFromHistory(size_t i);

     virtual int GetMaxFiles() const { return m_fileMaxFiles; }
     virtual void UseMenu(wxMenu *menu);
 
     virtual int GetMaxFiles() const { return m_fileMaxFiles; }
     virtual void UseMenu(wxMenu *menu);
 


@@ -544,11 +556,11 @@ public:
     virtual void AddFilesToMenu(wxMenu* menu); // Single menu
 
     // Accessors
     virtual void AddFilesToMenu(wxMenu* menu); // Single menu
 
     // Accessors

-    virtual wxString GetHistoryFile(int i) const;
+    virtual wxString GetHistoryFile(size_t i) const;

 
     // A synonym for GetNoHistoryFiles
 
     // A synonym for GetNoHistoryFiles

-    virtual int GetCount() const { return m_fileHistoryN; }
-    int GetNoHistoryFiles() const { return m_fileHistoryN; }
+    virtual size_t GetCount() const { return m_fileHistoryN; }
+    size_t GetNoHistoryFiles() const { return m_fileHistoryN; }

 
     wxList& GetMenus() const { return (wxList&) m_fileMenus; }
 
 
     wxList& GetMenus() const { return (wxList&) m_fileMenus; }
 


@@ -556,11 +568,18 @@ protected:
     // Last n files
     wxChar**          m_fileHistory;
     // Number of files saved
     // Last n files
     wxChar**          m_fileHistory;
     // Number of files saved

-    int               m_fileHistoryN;
+    size_t            m_fileHistoryN;

     // Menus to maintain (may need several for an MDI app)
     wxList            m_fileMenus;
     // Max files to maintain
     // Menus to maintain (may need several for an MDI app)
     wxList            m_fileMenus;
     // Max files to maintain

-    int               m_fileMaxFiles;
+    size_t            m_fileMaxFiles;
+    
+private:
+    // The ID of the first history menu item (Doesn't have to be wxID_FILE1)
+    wxWindowID m_idBase;
+
+    DECLARE_DYNAMIC_CLASS(wxFileHistory)
+    DECLARE_NO_COPY_CLASS(wxFileHistory)

 };
 
 #if wxUSE_STD_IOSTREAM
 };
 
 #if wxUSE_STD_IOSTREAM


@@ -573,6 +592,8 @@ bool WXDLLEXPORT wxTransferStreamToFile(wxSTD istream& stream, const wxString& f
 // converts from/to a stream to/from a temporary file.
 bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
 bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
 // converts from/to a stream to/from a temporary file.
 bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
 bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);

-#endif
+#endif // wxUSE_STD_IOSTREAM
+
+#endif // wxUSE_DOC_VIEW_ARCHITECTURE

 
 #endif // _WX_DOCH__
 
 #endif // _WX_DOCH__