cleaning up problems after string changes

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 46cc57c211cdab46df39843bdabce166edd4657b..79749c12ae610ea293b8e8d8f70a551307a80ee4 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -589,16 +589,14 @@ public:
     virtual void AddFilesToMenu(wxMenu* menu); // Single menu
 
     // Accessors
-    virtual wxString GetHistoryFile(size_t i) const;
-    virtual size_t GetCount() const { return m_fileHistoryN; }
+    virtual wxString GetHistoryFile(size_t i) const { return m_fileHistory[i]; }
+    virtual size_t GetCount() const { return m_fileHistory.GetCount(); }
 
     const wxList& GetMenus() const { return m_fileMenus; }
 
-#if wxABI_VERSION >= 20802
     // Set/get base id
     void SetBaseId(wxWindowID baseId) { m_idBase = baseId; }
     wxWindowID GetBaseId() const { return m_idBase; }
-#endif // wxABI 2.8.2+
 
 #if WXWIN_COMPATIBILITY_2_6
     // deprecated, use GetCount() instead
@@ -607,11 +605,11 @@ public:
 
 protected:
     // Last n files
-    wxChar**          m_fileHistory;
-    // Number of files saved
-    size_t            m_fileHistoryN;
+    wxArrayString     m_fileHistory;
+
     // Menus to maintain (may need several for an MDI app)
     wxList            m_fileMenus;
+
     // Max files to maintain
     size_t            m_fileMaxFiles;
 
@@ -626,7 +624,7 @@ private:
 #if WXWIN_COMPATIBILITY_2_6
 inline size_t wxFileHistory::GetNoHistoryFiles() const
 {
-    return m_fileHistoryN;
+    return m_fileHistory.GetCount();
 }
 #endif // WXWIN_COMPATIBILITY_2_6