Use DeafultAttributes instead of hard coded defaults

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 57cf016b972b97f343ab0d03a2484ffd44fec774..0d005d04b6c4717117bc9d05df7b27c2575f2d20 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 

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

     #pragma interface "docview.h"
 #endif
 
     #pragma interface "docview.h"
 #endif
 


@@ -40,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


@@ -97,7 +97,7 @@ 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 OnSaveDocument(const wxString& filename);
     virtual bool OnOpenDocument(const wxString& filename);
     virtual bool OnNewDocument();


@@ -161,7 +161,7 @@ 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)
 private:
     DECLARE_ABSTRACT_CLASS(wxDocument)
     DECLARE_NO_COPY_CLASS(wxDocument)


@@ -202,11 +202,6 @@ public:
     // 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);
 


@@ -259,6 +254,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 +276,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:


@@ -292,7 +294,7 @@ 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)
 private:
     DECLARE_CLASS(wxDocTemplate)
     DECLARE_NO_COPY_CLASS(wxDocTemplate)


@@ -302,8 +304,6 @@ private:
 // the templates and documents.
 class WXDLLEXPORT wxDocManager: public wxEvtHandler
 {
 // the templates and documents.
 class WXDLLEXPORT wxDocManager: public wxEvtHandler
 {

-    DECLARE_DYNAMIC_CLASS(wxDocManager)
-

 public:
     wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE);
     ~wxDocManager();
 public:
     wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE);
     ~wxDocManager();


@@ -373,12 +373,15 @@ public:
     // closes all currently open documents
     bool CloseDocuments(bool force = TRUE);
 
     // closes all currently open documents
     bool CloseDocuments(bool force = TRUE);
 

+    // closes the specified document
+    bool CloseDocument(wxDocument* doc, bool force = FALSE);
+

     // Clear remaining documents and templates
     bool Clear(bool force = TRUE);
 
     // Views or windows should inform the document manager
     // when a view is going in or out of focus
     // Clear remaining documents and templates
     bool Clear(bool force = TRUE);
 
     // 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 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; }


@@ -395,9 +398,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 GetHistoryFilesCount() 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


@@ -408,12 +411,15 @@ public:
     virtual void FileHistoryAddFilesToMenu();
     virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
 
     virtual void FileHistoryAddFilesToMenu();
     virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
 

-    inline wxString GetLastDirectory() const { return m_lastDirectory; }
-    inline void SetLastDirectory(const wxString& dir) { m_lastDirectory = dir; }
+    wxString GetLastDirectory() const { return m_lastDirectory; }
+    void SetLastDirectory(const wxString& dir) { m_lastDirectory = dir; }

 
     // Get the current document manager
     static wxDocManager* GetDocumentManager() { return sm_docManager; }
 
 
     // Get the current document manager
     static wxDocManager* GetDocumentManager() { return sm_docManager; }
 

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

 protected:
     long              m_flags;
     int               m_defaultDocumentNameCounter;
 protected:
     long              m_flags;
     int               m_defaultDocumentNameCounter;


@@ -426,9 +432,15 @@ protected:
     static wxDocManager* sm_docManager;
 
     DECLARE_EVENT_TABLE()
     static wxDocManager* sm_docManager;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDocManager)

     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 
     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 

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

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


@@ -535,12 +547,12 @@ private:
 class WXDLLEXPORT wxFileHistory : public wxObject
 {
 public:
 class WXDLLEXPORT wxFileHistory : public wxObject
 {
 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);
 


@@ -556,29 +568,37 @@ 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;
+    virtual size_t GetCount() const { return m_fileHistoryN; }

 
 

-    // A synonym for GetNoHistoryFiles
-    virtual int GetCount() const { return m_fileHistoryN; }
-    int GetNoHistoryFiles() const { return m_fileHistoryN; }
+    const wxList& GetMenus() const { return m_fileMenus; }

 
 

-    wxList& GetMenus() const { return (wxList&) m_fileMenus; }
+    // deprecated, use GetCount() instead
+    wxDEPRECATED( size_t GetNoHistoryFiles() const );

 
 protected:
     // Last n files
     wxChar**          m_fileHistory;
     // Number of files saved
 
 protected:
     // 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:
 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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFileHistory)
     DECLARE_NO_COPY_CLASS(wxFileHistory)
 };
 

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

 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 // converts from/to a stream to/from a temporary file.
 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 // converts from/to a stream to/from a temporary file.