AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

menu title is drawn in bold font and the commands from it are ignored

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-02-06 23:38:19 +00:00
parent f303327872
commit a3f4e9e81a
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/msw/menu.cpp
View File

@ -341,7 +341,19 @@ void wxMenu::SetTitle(const wxString& label)
}
}
// TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face
// put the title string in bold face
if ( !m_title.IsEmpty() )
{
MENUITEMINFO mii;
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_STATE;
mii.fState = MFS_DEFAULT;
if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) )
{
wxLogLastError("SetMenuItemInfo");
}
}
}
const wxString wxMenu::GetTitle() const
@ -413,12 +425,19 @@ wxString wxMenu::GetLabel(int id) const
bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
{
wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
event.SetEventObject( this );
event.SetId( id );
event.SetInt( id );
ProcessCommand(event);
return TRUE;
// ignore commands from the menu title
// NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!!
if ( id != (WXWORD)idMenuTitle )
{
wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
event.SetEventObject( this );
event.SetId( id );
event.SetInt( id );
ProcessCommand(event);
}
return TRUE;
}
// Finds the item id matching the given string, -1 if not found.