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

Fixed OnMenuHighlight, wxPrintData problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-04-06 12:55:44 +00:00
parent 19d40bab31
commit 58abfef64f
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/frame.cpp
View File

@@ -761,7 +761,7 @@ void wxFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
}
else if (nFlags != MF_SEPARATOR)
else if ((nFlags != MF_SEPARATOR) && (nItem != 0) && (nItem != 65535))
{
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, nItem);
event.SetEventObject( this );
@@ -863,7 +863,7 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
if ( menuId != -1 )
{
wxMenuBar *menuBar = GetMenuBar();
if (menuBar)
if (menuBar && menuBar->FindItem(menuId))
{
// set status text even if the string is empty - this will at
// least remove the string from the item which was previously