From: Vadim Zeitlin Date: Wed, 11 Apr 2007 00:26:09 +0000 (+0000) Subject: compilation fix after last commit X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8e4ac1a0689c4590c06122648e6f26f9a5988b0a 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 8c7213338f..79749c12ae 100644 --- 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 69e26570b8..903a78c25a 100644 --- 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