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

Implemented wxMenuBar::Insert and wxMenu::Insert.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-09-30 09:15:52 +00:00
parent eb9d223a9a
commit 51c9a5db64
5 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/motif/menuitem.cpp
View File

@@ -158,7 +158,8 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
// Motif-specific
// ----------------------------------------------------------------------------
void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu)
void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar,
wxMenu * topMenu, size_t index)
{
m_menuBar = menuBar;
m_topMenu = topMenu;
@@ -177,12 +178,18 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen
{
m_buttonWidget = (WXWidget) XtVaCreateManagedWidget (strName,
xmToggleButtonGadgetClass, (Widget) menu,
#ifdef XmNpositionIndex
XmNpositionIndex, index,
#endif
NULL);
XtVaSetValues ((Widget) m_buttonWidget, XmNset, (Boolean) IsChecked(), NULL);
}
else
m_buttonWidget = (WXWidget) XtVaCreateManagedWidget (strName,
xmPushButtonGadgetClass, (Widget) menu,
#ifdef XmNpositionIndex
XmNpositionIndex, index,
#endif
NULL);
char mnem = wxFindMnemonic (m_text);
if (mnem != 0)
@@ -225,11 +232,15 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen
else if (GetId() == wxID_SEPARATOR)
{
m_buttonWidget = (WXWidget) XtVaCreateManagedWidget ("separator",
xmSeparatorGadgetClass, (Widget) menu, NULL);
xmSeparatorGadgetClass, (Widget) menu,
#ifndef XmNpositionIndex
XmNpositionIndex, index,
#endif
NULL);
}
else if (m_subMenu)
{
m_buttonWidget = m_subMenu->CreateMenu (menuBar, menu, topMenu, m_text, true);
m_buttonWidget = m_subMenu->CreateMenu (menuBar, menu, topMenu, index, m_text, true);
m_subMenu->SetButtonWidget(m_buttonWidget);
XtAddCallback ((Widget) m_buttonWidget,
XmNcascadingCallback,