Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / common / filehistorycmn.cpp

diff --git a/src/common/filehistorycmn.cpp b/src/common/filehistorycmn.cpp
index 59898ba52bf136ff5b97bdb02f5e15c8f29fc7d7..9775f167b487cfc69980ee860c421a5656b6fa4c 100644 (file)
--- a/src/common/filehistorycmn.cpp
+++ b/src/common/filehistorycmn.cpp
@@ -62,13 +62,13 @@ wxString GetMRUEntryLabel(int n, const wxString& path)
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 

-wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
+wxFileHistoryBase::wxFileHistoryBase(size_t maxFiles, wxWindowID idBase)

 {
     m_fileMaxFiles = maxFiles;
     m_idBase = idBase;
 }
 
 {
     m_fileMaxFiles = maxFiles;
     m_idBase = idBase;
 }
 

-void wxFileHistory::AddFileToHistory(const wxString& file)
+void wxFileHistoryBase::AddFileToHistory(const wxString& file)

 {
     // check if we don't already have this file
     const wxFileName fnNew(file);
 {
     // check if we don't already have this file
     const wxFileName fnNew(file);


@@ -138,11 +138,11 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     }
 }
 
     }
 }
 

-void wxFileHistory::RemoveFileFromHistory(size_t i)
+void wxFileHistoryBase::RemoveFileFromHistory(size_t i)

 {
     size_t numFiles = m_fileHistory.size();
     wxCHECK_RET( i < numFiles,
 {
     size_t numFiles = m_fileHistory.size();
     wxCHECK_RET( i < numFiles,

-                 wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
+                 wxT("invalid index in wxFileHistoryBase::RemoveFileFromHistory") );

 
     // delete the element from the array
     m_fileHistory.RemoveAt(i);
 
     // delete the element from the array
     m_fileHistory.RemoveAt(i);


@@ -181,19 +181,19 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
     }
 }
 
     }
 }
 

-void wxFileHistory::UseMenu(wxMenu *menu)
+void wxFileHistoryBase::UseMenu(wxMenu *menu)

 {
     if ( !m_fileMenus.Member(menu) )
         m_fileMenus.Append(menu);
 }
 
 {
     if ( !m_fileMenus.Member(menu) )
         m_fileMenus.Append(menu);
 }
 

-void wxFileHistory::RemoveMenu(wxMenu *menu)
+void wxFileHistoryBase::RemoveMenu(wxMenu *menu)

 {
     m_fileMenus.DeleteObject(menu);
 }
 
 #if wxUSE_CONFIG
 {
     m_fileMenus.DeleteObject(menu);
 }
 
 #if wxUSE_CONFIG

-void wxFileHistory::Load(const wxConfigBase& config)
+void wxFileHistoryBase::Load(const wxConfigBase& config)

 {
     m_fileHistory.Clear();
 
 {
     m_fileHistory.Clear();
 


@@ -213,7 +213,7 @@ void wxFileHistory::Load(const wxConfigBase& config)
     AddFilesToMenu();
 }
 
     AddFilesToMenu();
 }
 

-void wxFileHistory::Save(wxConfigBase& config)
+void wxFileHistoryBase::Save(wxConfigBase& config)

 {
     size_t i;
     for (i = 0; i < m_fileMaxFiles; i++)
 {
     size_t i;
     for (i = 0; i < m_fileMaxFiles; i++)


@@ -228,7 +228,7 @@ void wxFileHistory::Save(wxConfigBase& config)
 }
 #endif // wxUSE_CONFIG
 
 }
 #endif // wxUSE_CONFIG
 

-void wxFileHistory::AddFilesToMenu()
+void wxFileHistoryBase::AddFilesToMenu()

 {
     if ( m_fileHistory.empty() )
         return;
 {
     if ( m_fileHistory.empty() )
         return;


@@ -241,7 +241,7 @@ void wxFileHistory::AddFilesToMenu()
     }
 }
 
     }
 }
 

-void wxFileHistory::AddFilesToMenu(wxMenu* menu)
+void wxFileHistoryBase::AddFilesToMenu(wxMenu* menu)

 {
     if ( m_fileHistory.empty() )
         return;
 {
     if ( m_fileHistory.empty() )
         return;