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

Fixes for OS/2 wxUniv merge.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-07-06 21:47:52 +00:00
parent 537760597b
commit 0367c1c0e8
11 changed files with 851 additions and 1523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/os2/menu.cpp
View File

@@ -559,73 +559,21 @@ bool wxMenu::OS2Command(
if (vId != (WXWORD)idMenuTitle)
{
wxCommandEvent vEvent(wxEVT_COMMAND_MENU_SELECTED);
vEvent.SetEventObject(this);
vEvent.SetId(vId);
vEvent.SetInt(vId);
ProcessCommand(vEvent);
SendEvent( vId
,(int)::WinSendMsg( GetHmenu()
,MM_QUERYITEMATTR
,(MPARAM)vId
,(MPARAM)MIA_CHECKED
)
);
}
return TRUE;
} // end of wxMenu::OS2Command
bool wxMenu::ProcessCommand(
wxCommandEvent& rEvent
)
{
bool bProcessed = FALSE;
#if wxUSE_MENU_CALLBACK
//
// Try a callback
//
if (m_callback)
{
(void)(*(m_callback))(*this, rEvent);
bProcessed = TRUE;
}
#endif // wxUSE_MENU_CALLBACK
//
// Try the menu's event handler
//
if (!bProcessed && GetEventHandler())
{
bProcessed = GetEventHandler()->ProcessEvent(rEvent);
}
//
// Try the window the menu was popped up from (and up through the
// hierarchy)
wxWindow* pWin = GetInvokingWindow();
if (!bProcessed && pWin)
bProcessed = pWin->GetEventHandler()->ProcessEvent(rEvent);
return bProcessed;
} // end of wxMenu::ProcessCommand
// ---------------------------------------------------------------------------
// other
// ---------------------------------------------------------------------------
void wxMenu::Attach(
wxMenuBar* pMenubar
)
{
//
// Menu can be in at most one menubar because otherwise they would both
// delete the menu pointer
//
wxASSERT_MSG(!m_menuBar, wxT("menu belongs to 2 menubars, expect a crash"));
m_menuBar = pMenubar;
} // end of
void wxMenu::Detach()
{
wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") );
m_menuBar = NULL;
} // end of wxMenu::Detach
wxWindow* wxMenu::GetWindow() const
{
if (m_invokingWindow != NULL)