compilation fix after last commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 8c7213338f16c14e6b27cc842a5259f45bf1af36..79749c12ae610ea293b8e8d8f70a551307a80ee4 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -624,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
 

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 69e26570b8959ab6d8c8999a705ec032d30f988d..903a78c25a9045bfad33ca83191e1f3add49e47b 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -151,9 +151,9 @@ private:
 };
 
 #if WXWIN_COMPATIBILITY_2_8
-void wxMenuItem::SetName(const wxString &str)
+void wxMenuItemBase::SetName(const wxString &str)
     { SetText(str); }
-const wxString& wxMenuItem::GetName() const
+const wxString& wxMenuItemBase::GetName() const
     { return GetText(); }
 #endif // WXWIN_COMPATIBILITY_2_8