Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse functionality of wxGetStockLabel().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-08-16 20:23:04 +00:00
parent 89c9b933e3
commit e27d9a9106
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/mdig.cpp
View File

@@ -35,6 +35,7 @@
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/generic/mdig.h" #include "wx/generic/mdig.h"
#include "wx/stockitem.h"
enum MDI_MENU_ID enum MDI_MENU_ID
{ {
@@ -307,7 +308,7 @@ void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
{ {
if (pMenuBar && m_pWindowMenu) if (pMenuBar && m_pWindowMenu)
{ {
int pos = pMenuBar->FindMenu(wxStripMenuCodes(wxString(_("&Help")))); int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,false));
if (pos == wxNOT_FOUND) if (pos == wxNOT_FOUND)
{ {
pMenuBar->Append(m_pWindowMenu, _("&Window")); pMenuBar->Append(m_pWindowMenu, _("&Window"));

4
src/msw/mdi.cpp
View File

@@ -45,6 +45,7 @@
#include "wx/log.h" #include "wx/log.h"
#endif #endif
#include "wx/stockitem.h"
#include "wx/mdi.h" #include "wx/mdi.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
@@ -1401,9 +1402,8 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
continue; continue;
} }
wxString strHelp(_("&Help"));
wxString strBuf(buf); wxString strBuf(buf);
if ( wxStripMenuCodes(strBuf) == wxStripMenuCodes(strHelp) ) if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) )
{ {
success = true; success = true;
::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,