fixes to menu stock items support (patch 1547639)

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index de70706367f61e7c38799d5248e4a2f47366cf2a..5aa48192a3190780dda931651637e9741e82bc04 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        docview.h
+// Name:        wx/docview.h

 // Purpose:     Doc/View classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     Doc/View classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "docview.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 #include "wx/defs.h"
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE


@@ -69,10 +65,10 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler
 {
 public:
     wxDocument(wxDocument *parent = (wxDocument *) NULL);
 {
 public:
     wxDocument(wxDocument *parent = (wxDocument *) NULL);

-    ~wxDocument();
+    virtual ~wxDocument();

 
     // accessors
 
     // accessors

-    void SetFilename(const wxString& filename, bool notifyViews = FALSE);
+    void SetFilename(const wxString& filename, bool notifyViews = false);

     wxString GetFilename() const { return m_documentFile; }
 
     void SetTitle(const wxString& title) { m_documentTitle = title; };
     wxString GetFilename() const { return m_documentFile; }
 
     void SetTitle(const wxString& title) { m_documentTitle = title; };


@@ -82,7 +78,7 @@ public:
     wxString GetDocumentName() const { return m_documentTypeName; }
 
     bool GetDocumentSaved() const { return m_savedYet; }
     wxString GetDocumentName() const { return m_documentTypeName; }
 
     bool GetDocumentSaved() const { return m_savedYet; }

-    void SetDocumentSaved(bool saved = TRUE) { m_savedYet = saved; }
+    void SetDocumentSaved(bool saved = true) { m_savedYet = saved; }

 
     virtual bool Close();
     virtual bool Save();
 
     virtual bool Close();
     virtual bool Save();


@@ -97,15 +93,15 @@ public:
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
 
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
 

-    // Called by wxWindows
+    // Called by wxWidgets

     virtual bool OnSaveDocument(const wxString& filename);
     virtual bool OnOpenDocument(const wxString& filename);
     virtual bool OnNewDocument();
     virtual bool OnCloseDocument();
 
     virtual bool OnSaveDocument(const wxString& filename);
     virtual bool OnOpenDocument(const wxString& filename);
     virtual bool OnNewDocument();
     virtual bool OnCloseDocument();
 

-    // Prompts for saving if about to close a modified document. Returns TRUE
+    // Prompts for saving if about to close a modified document. Returns true

     // if ok to close the document (may have saved in the meantime, or set
     // if ok to close the document (may have saved in the meantime, or set

-    // modified to FALSE)
+    // modified to false)

     virtual bool OnSaveModified();
 
     // Called by framework if created automatically by the default document
     virtual bool OnSaveModified();
 
     // Called by framework if created automatically by the default document


@@ -130,7 +126,8 @@ public:
 
     virtual bool AddView(wxView *view);
     virtual bool RemoveView(wxView *view);
 
     virtual bool AddView(wxView *view);
     virtual bool RemoveView(wxView *view);

-    wxList& GetViews() const { return (wxList&) m_documentViews; }
+    wxList& GetViews() { return m_documentViews; }
+    const wxList& GetViews() const { return m_documentViews; }

     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);


@@ -162,6 +159,12 @@ protected:
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;
 
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;
 

+    // Called by OnSaveDocument and OnOpenDocument to implement standard
+    // Save/Load behavior. Re-implement in derived class for custom
+    // behavior.
+    virtual bool DoSaveDocument(const wxString& file);
+    virtual bool DoOpenDocument(const wxString& file);
+

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


@@ -172,7 +175,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
 public:
     //  wxView(wxDocument *doc = (wxDocument *) NULL);
     wxView();
 public:
     //  wxView(wxDocument *doc = (wxDocument *) NULL);
     wxView();

-    ~wxView();
+    virtual ~wxView();

 
     wxDocument *GetDocument() const { return m_viewDocument; }
     virtual void SetDocument(wxDocument *doc);
 
     wxDocument *GetDocument() const { return m_viewDocument; }
     virtual void SetDocument(wxDocument *doc);


@@ -187,26 +190,21 @@ public:
     virtual void OnDraw(wxDC *dc) = 0;
     virtual void OnPrint(wxDC *dc, wxObject *info);
     virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
     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 OnClosingDocument() {}

     virtual void OnChangeFilename();
 
     // Called by framework if created automatically by the default document
     // manager class: gives view a chance to initialise
     virtual void OnChangeFilename();
 
     // Called by framework if created automatically by the default document
     // manager class: gives view a chance to initialise

-    virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return TRUE; };
+    virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; };

 
     // Checks if the view is the last one for the document; if so, asks user
     // to confirm save data (if modified). If ok, deletes itself and returns
 
     // Checks if the view is the last one for the document; if so, asks user
     // to confirm save data (if modified). If ok, deletes itself and returns

-    // TRUE.
-    virtual bool Close(bool deleteWindow = TRUE);
+    // true.
+    virtual bool Close(bool deleteWindow = true);

 
     // Override to do cleanup/veto close
     virtual bool OnClose(bool deleteWindow);
 
 
     // Override to do cleanup/veto close
     virtual bool OnClose(bool deleteWindow);
 

-#if WXWIN_COMPATIBILITY
-    // Defeat compiler warning
-    bool OnClose() { return wxEvtHandler::OnClose(); }
-#endif
-

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


@@ -251,7 +249,7 @@ public:
                   wxClassInfo *viewClassInfo = (wxClassInfo *)NULL,
                   long flags = wxDEFAULT_TEMPLATE_FLAGS);
 
                   wxClassInfo *viewClassInfo = (wxClassInfo *)NULL,
                   long flags = wxDEFAULT_TEMPLATE_FLAGS);
 

-    ~wxDocTemplate();
+    virtual ~wxDocTemplate();

 
     // By default, these two member functions dynamically creates document and
     // view using dynamic instance construction. Override these if you need a
 
     // By default, these two member functions dynamically creates document and
     // view using dynamic instance construction. Override these if you need a


@@ -259,6 +257,10 @@ public:
     virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);
     virtual wxView *CreateView(wxDocument *doc, long flags = 0);
 
     virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);
     virtual wxView *CreateView(wxDocument *doc, long flags = 0);
 

+    // Helper method for CreateDocument; also allows you to do your own document
+    // creation
+    virtual bool InitDocument(wxDocument* doc, const wxString& path, long flags = 0);
+

     wxString GetDefaultExtension() const { return m_defaultExt; };
     wxString GetDescription() const { return m_description; }
     wxString GetDirectory() const { return m_directory; };
     wxString GetDefaultExtension() const { return m_defaultExt; };
     wxString GetDescription() const { return m_description; }
     wxString GetDirectory() const { return m_directory; };


@@ -277,6 +279,9 @@ public:
 
     bool IsVisible() const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); }
 
 
     bool IsVisible() const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); }
 

+    wxClassInfo* GetDocClassInfo() const { return m_docClassInfo; }
+    wxClassInfo* GetViewClassInfo() const { return m_viewClassInfo; }
+

     virtual bool FileMatchesTemplate(const wxString& path);
 
 protected:
     virtual bool FileMatchesTemplate(const wxString& path);
 
 protected:


@@ -293,6 +298,12 @@ protected:
     wxClassInfo*      m_docClassInfo;
     wxClassInfo*      m_viewClassInfo;
 
     wxClassInfo*      m_docClassInfo;
     wxClassInfo*      m_viewClassInfo;
 

+    // Called by CreateDocument and CreateView to create the actual document/view object.
+    // By default uses the ClassInfo provided to the constructor. Override these functions
+    // to provide a different method of creation.
+    virtual wxDocument *DoCreateDocument();
+    virtual wxView *DoCreateView();
+

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


@@ -303,8 +314,8 @@ private:
 class WXDLLEXPORT wxDocManager: public wxEvtHandler
 {
 public:
 class WXDLLEXPORT wxDocManager: public wxEvtHandler
 {
 public:

-    wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE);
-    ~wxDocManager();
+    wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true);
+    virtual ~wxDocManager();

 
     virtual bool Initialize();
 
 
     virtual bool Initialize();
 


@@ -317,7 +328,6 @@ public:
     void OnFileSave(wxCommandEvent& event);
     void OnFileSaveAs(wxCommandEvent& event);
     void OnPrint(wxCommandEvent& event);
     void OnFileSave(wxCommandEvent& event);
     void OnFileSaveAs(wxCommandEvent& event);
     void OnPrint(wxCommandEvent& event);

-    void OnPrintSetup(wxCommandEvent& event);

     void OnPreview(wxCommandEvent& event);
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);
     void OnPreview(wxCommandEvent& event);
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);


@@ -333,7 +343,6 @@ public:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     void OnUpdatePrint(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     void OnUpdatePrint(wxUpdateUIEvent& event);

-    void OnUpdatePrintSetup(wxUpdateUIEvent& event);

     void OnUpdatePreview(wxUpdateUIEvent& event);
 
     // Extend event processing to search the view's event table
     void OnUpdatePreview(wxUpdateUIEvent& event);
 
     // Extend event processing to search the view's event table


@@ -349,11 +358,11 @@ public:
     virtual bool FlushDoc(wxDocument *doc);
     virtual wxDocTemplate *MatchTemplate(const wxString& path);
     virtual wxDocTemplate *SelectDocumentPath(wxDocTemplate **templates,
     virtual bool FlushDoc(wxDocument *doc);
     virtual wxDocTemplate *MatchTemplate(const wxString& path);
     virtual wxDocTemplate *SelectDocumentPath(wxDocTemplate **templates,

-            int noTemplates, wxString& path, long flags, bool save = FALSE);
+            int noTemplates, wxString& path, long flags, bool save = false);

     virtual wxDocTemplate *SelectDocumentType(wxDocTemplate **templates,
     virtual wxDocTemplate *SelectDocumentType(wxDocTemplate **templates,

-            int noTemplates, bool sort = FALSE);
+            int noTemplates, bool sort = false);

     virtual wxDocTemplate *SelectViewType(wxDocTemplate **templates,
     virtual wxDocTemplate *SelectViewType(wxDocTemplate **templates,

-            int noTemplates, bool sort = FALSE);
+            int noTemplates, bool sort = false);

     virtual wxDocTemplate *FindTemplateForPath(const wxString& path);
 
     void AssociateTemplate(wxDocTemplate *temp);
     virtual wxDocTemplate *FindTemplateForPath(const wxString& path);
 
     void AssociateTemplate(wxDocTemplate *temp);


@@ -369,17 +378,17 @@ public:
     void RemoveDocument(wxDocument *doc);
 
     // closes all currently open documents
     void RemoveDocument(wxDocument *doc);
 
     // closes all currently open documents

-    bool CloseDocuments(bool force = TRUE);
+    bool CloseDocuments(bool force = true);

 
     // closes the specified document
 
     // closes the specified document

-    bool CloseDocument(wxDocument* doc, bool force = FALSE);
+    bool CloseDocument(wxDocument* doc, bool force = false);

 
     // Clear remaining documents and templates
 
     // Clear remaining documents and templates

-    bool Clear(bool force = TRUE);
+    bool Clear(bool force = true);

 
     // Views or windows should inform the document manager
     // when a view is going in or out of focus
 
     // 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);
+    virtual void ActivateView(wxView *view, bool activate = true);

     virtual wxView *GetCurrentView() const;
 
     wxList& GetDocuments() { return m_docs; }
     virtual wxView *GetCurrentView() const;
 
     wxList& GetDocuments() { return m_docs; }


@@ -415,8 +424,10 @@ public:
     // Get the current document manager
     static wxDocManager* GetDocumentManager() { return sm_docManager; }
 
     // Get the current document manager
     static wxDocManager* GetDocumentManager() { return sm_docManager; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, use GetHistoryFilesCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );
     // deprecated, use GetHistoryFilesCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     long              m_flags;
 
 protected:
     long              m_flags;


@@ -434,10 +445,12 @@ protected:
     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 
     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 

+#if WXWIN_COMPATIBILITY_2_6

 inline size_t wxDocManager::GetNoHistoryFiles() const
 {
     return GetHistoryFilesCount();
 }
 inline size_t wxDocManager::GetNoHistoryFiles() const
 {
     return GetHistoryFilesCount();
 }

+#endif // WXWIN_COMPATIBILITY_2_6

 
 // ----------------------------------------------------------------------------
 // A default child frame
 
 // ----------------------------------------------------------------------------
 // A default child frame


@@ -455,7 +468,7 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long type = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxT("frame"));
                     const wxSize& size = wxDefaultSize,
                     long type = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxT("frame"));

-    ~wxDocChildFrame();
+    virtual ~wxDocChildFrame(){}

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


@@ -546,12 +559,12 @@ class WXDLLEXPORT wxFileHistory : public wxObject
 {
 public:
     wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
 {
 public:
     wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);

-    ~wxFileHistory();
+    virtual ~wxFileHistory();

 
     // Operations
     virtual void AddFileToHistory(const wxString& file);
     virtual void RemoveFileFromHistory(size_t i);
 
     // Operations
     virtual void AddFileToHistory(const wxString& file);
     virtual void RemoveFileFromHistory(size_t i);

-    virtual int GetMaxFiles() const { return m_fileMaxFiles; }
+    virtual int GetMaxFiles() const { return (int)m_fileMaxFiles; }

     virtual void UseMenu(wxMenu *menu);
 
     // Remove menu from the list (MDI child may be closing)
     virtual void UseMenu(wxMenu *menu);
 
     // Remove menu from the list (MDI child may be closing)


@@ -571,8 +584,10 @@ public:
 
     const wxList& GetMenus() const { return m_fileMenus; }
 
 
     const wxList& GetMenus() const { return m_fileMenus; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, use GetCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );
     // deprecated, use GetCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     // Last n files
 
 protected:
     // Last n files


@@ -592,10 +607,12 @@ private:
     DECLARE_NO_COPY_CLASS(wxFileHistory)
 };
 
     DECLARE_NO_COPY_CLASS(wxFileHistory)
 };
 

+#if WXWIN_COMPATIBILITY_2_6

 inline size_t wxFileHistory::GetNoHistoryFiles() const
 {
     return m_fileHistoryN;
 }
 inline size_t wxFileHistory::GetNoHistoryFiles() const
 {
     return m_fileHistoryN;
 }

+#endif // WXWIN_COMPATIBILITY_2_6

 
 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 
 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats: