//
// Find the (new) accel for this item
//
- wxAcceleratorEntry* pAccel = wxAcceleratorEntry::Create(pItem->GetText());
+ wxAcceleratorEntry* pAccel = wxAcceleratorEntry::Create(pItem->GetItemLabel());
if (pAccel)
pAccel->m_command = pItem->GetId();
//
rItem.afStyle |= MIS_TEXT;
}
- pData = pItem->GetText().char_str();
+ pData = (char*) pItem->GetItemLabel().wx_str();
}
if (nPos == (size_t)-1)
wxMenuItem* wxMenu::DoAppend( wxMenuItem* pItem )
{
- wxCHECK_MSG( pItem, NULL, _T("NULL item in wxMenu::DoAppend") );
+ wxCHECK_MSG( pItem, NULL, wxT("NULL item in wxMenu::DoAppend") );
bool bCheck = false;
}
else
{
- wxFAIL_MSG( _T("where is the radio group start item?") );
+ wxFAIL_MSG( wxT("where is the radio group start item?") );
}
}
}
(*it)->m_vMenuData.iPosition = (SHORT)i;
- rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].char_str());
+ rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].wx_str());
if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
{
vError = ::WinGetLastError(vHabmain);
Refresh();
} // end of wxMenuBar::EnableTop
-void wxMenuBar::SetLabelTop(
+void wxMenuBar::SetMenuLabel(
size_t nPos
, const wxString& rLabel
)
}
nId = vItem.id;
- if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.char_str()));
+ if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.wx_str()));
{
wxLogLastError(wxT("ModifyMenu"));
}
Refresh();
-} // end of wxMenuBar::SetLabelTop
+} // end of wxMenuBar::SetMenuLabel
-wxString wxMenuBar::GetLabelTop(
+wxString wxMenuBar::GetMenuLabel(
size_t nPos
) const
{
wxCHECK_MSG( nPos < GetMenuCount(), wxEmptyString,
- wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+ wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
return m_titles[nPos];
-} // end of wxMenuBar::GetLabelTop
+} // end of wxMenuBar::GetMenuLabel
// ---------------------------------------------------------------------------
// wxMenuBar construction
if (IsAttached())
{
::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
- ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.char_str());
+ ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
#if wxUSE_ACCEL
if (pMenuOld->HasAccels() || pMenu->HasAccels())
::WinSendMsg( (HWND)m_hMenu
,MM_INSERTITEM
,(MPARAM)&pMenu->m_vMenuData
- ,(MPARAM)sTitle.char_str()
+ ,(MPARAM)sTitle.wx_str()
);
#if wxUSE_ACCEL
if (pMenu->HasAccels())
if ( IsAttached() )
{
pMenu->m_vMenuData.iPosition = MIT_END;
- ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.char_str());
+ ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
#if wxUSE_ACCEL
if (pMenu->HasAccels())
{
,m_vAccelTable.GetHACCEL()
,(HWND)pFrame->GetFrame()
))
+ {
wxLogLastError(wxT("WinSetAccelTable"));
+ }
#endif // wxUSE_ACCEL
} // end of wxMenuBar::Attach