Commited FRM's stockitem patch (empty stock items).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -161,7 +161,7 @@ void wxTabMDIParentFrame::SetChildMenuBar(wxTabMDIChildFrame* pChild)
|
||||
{
|
||||
if (pChild->GetMenuBar() == NULL)
|
||||
return;
|
||||
|
||||
|
||||
// Do we need to save the current bar?
|
||||
if (m_pMyMenuBar == NULL)
|
||||
m_pMyMenuBar = GetMenuBar();
|
||||
@@ -283,7 +283,7 @@ void wxTabMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
|
||||
{
|
||||
if (pMenuBar && m_pWindowMenu)
|
||||
{
|
||||
int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,false));
|
||||
int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));
|
||||
if (pos == wxNOT_FOUND)
|
||||
pMenuBar->Append(m_pWindowMenu, _("&Window"));
|
||||
else
|
||||
|
Reference in New Issue
Block a user