From db927071d5316194fc60a29d6007963c1945c908 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Aug 2006 23:21:18 +0000 Subject: [PATCH] don't use deprecated wxStripMenuCodes overload git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/motif/menu.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 0831f46864..abbe28a365 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -318,20 +318,17 @@ wxMenu *wxMenuBar::Remove(size_t pos) // Find the menu menuString, item itemString, and return the item id. // Returns -1 if none found. -int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const +int wxMenuBar::FindMenuItem(const wxString& menuString, const wxString& itemString) const { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes (wxConstCast(menuString.c_str(), char), buf1); + const wxString stripped = wxStripMenuCodes(menuString); size_t menuCount = GetMenuCount(); for (size_t i = 0; i < menuCount; i++) { - wxStripMenuCodes (wxConstCast(m_titles[i].c_str(), char), buf2); - if (strcmp (buf1, buf2) == 0) + if ( wxStripMenuCodes(m_titles[i]) == stripped ) return m_menus.Item(i)->GetData()->FindItem (itemString); } - return -1; + return wxNOT_FOUND; } wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const -- 2.47.2