projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix linking problems with MSVC 5.
[wxWidgets.git]
/
src
/
msw
/
menuitem.cpp
diff --git
a/src/msw/menuitem.cpp
b/src/msw/menuitem.cpp
index aae20373f74350125bdef85cdb5715c5b7801717..74a82794def96dfb00c6e6c9cb3b1a9d60f8fed0 100644
(file)
--- a/
src/msw/menuitem.cpp
+++ b/
src/msw/menuitem.cpp
@@
-104,7
+104,7
@@
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
: wxMenuItemBase(parentMenu, id, text, help,
isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
#if wxUSE_OWNER_DRAWN
: wxMenuItemBase(parentMenu, id, text, help,
isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
#if wxUSE_OWNER_DRAWN
-
, wxOwnerDrawn(text, isCheckable)
+ , wxOwnerDrawn(text, isCheckable)
#endif // owner drawn
{
Init();
#endif // owner drawn
{
Init();
@@
-300,6
+300,10
@@
void wxMenuItem::SetText(const wxString& text)
wxMenuItemBase::SetText(text);
OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
wxMenuItemBase::SetText(text);
OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+#if wxUSE_OWNER_DRAWN
+ // tell the owner drawing code to to show the accel string as well
+ SetAccelString(text.AfterFirst(_T('\t')));
+#endif
HMENU hMenu = GetHMenuOf(m_parentMenu);
wxCHECK_RET( hMenu, wxT("menuitem without menu") );
HMENU hMenu = GetHMenuOf(m_parentMenu);
wxCHECK_RET( hMenu, wxT("menuitem without menu") );