From: Włodzimierz Skiba Date: Tue, 16 Aug 2005 20:23:04 +0000 (+0000) Subject: Reuse functionality of wxGetStockLabel(). X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e27d9a9106d0696c9dee751e6c825577233e82f0 Reuse functionality of wxGetStockLabel(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp index b2ad4fd4e2..be8d84b8ba 100644 --- a/src/generic/mdig.cpp +++ b/src/generic/mdig.cpp @@ -35,6 +35,7 @@ #endif //WX_PRECOMP #include "wx/generic/mdig.h" +#include "wx/stockitem.h" enum MDI_MENU_ID { @@ -307,7 +308,7 @@ void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar) { if (pMenuBar && m_pWindowMenu) { - int pos = pMenuBar->FindMenu(wxStripMenuCodes(wxString(_("&Help")))); + int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,false)); if (pos == wxNOT_FOUND) { pMenuBar->Append(m_pWindowMenu, _("&Window")); diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index dad11b4bcd..44718647dc 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -45,6 +45,7 @@ #include "wx/log.h" #endif +#include "wx/stockitem.h" #include "wx/mdi.h" #include "wx/msw/private.h" @@ -1401,9 +1402,8 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) continue; } - wxString strHelp(_("&Help")); wxString strBuf(buf); - if ( wxStripMenuCodes(strBuf) == wxStripMenuCodes(strHelp) ) + if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) ) { success = true; ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,