/////////////////////////////////////////////////////////////////////////////
-// Name: menu.cpp
+// Name: src/os2/menu.cpp
// Purpose: wxMenu, wxMenuBar, wxMenuItem
// Author: David Webster
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "menu.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#include "wx/menu.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/frame.h"
- #include "wx/menu.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
//
void wxMenu::Init()
{
- m_bDoBreak = FALSE;
+ m_bDoBreak = false;
m_nStartRadioGroup = -1;
//
//
// If we have a title, insert it in the beginning of the menu
//
- if (!m_title.IsEmpty())
+ if (!m_title.empty())
{
Append( idMenuTitle
,m_title
void wxMenu::Break()
{
// this will take effect during the next call to Append()
- m_bDoBreak = TRUE;
+ m_bDoBreak = true;
} // end of wxMenu::Break
void wxMenu::Attach(
}
else if (!pItem->IsSeparator())
{
+ //
+ // Recurse upwards: we should only modify m_accels of the top level
+ // menus, not of the submenus as wxMenuBar doesn't look at them
+ // (alternative and arguable cleaner solution would be to recurse
+ // downwards in GetAccelCount() and CopyAccels())
+ //
+ if (GetParent())
+ {
+ GetParent()->UpdateAccel(pItem);
+ return;
+ }
+
//
// Find the (new) accel for this item
//
//
// Append a new item or submenu to the menu
//
-bool wxMenu::DoInsertOrAppend(
- wxMenuItem* pItem
-, size_t nPos
-)
+bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem,
+ size_t nPos )
{
- wxMenu* pSubmenu = pItem->GetSubMenu();
- MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
- pItem->m_vMenuData;
+ wxMenu* pSubmenu = pItem->GetSubMenu();
+ MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
+ pItem->m_vMenuData;
- ERRORID vError;
- wxString sError;
+ ERRORID vError;
+ wxString sError;
#if wxUSE_ACCEL
UpdateAccel(pItem);
if (m_bDoBreak)
{
rItem.afStyle |= MIS_BREAK;
- m_bDoBreak = FALSE;
+ m_bDoBreak = false;
}
//
}
else
{
- rItem.id = pItem->GetId();
+ rItem.id = (USHORT)pItem->GetId();
}
BYTE* pData=NULL;
}
else
{
- rItem.iPosition = nPos;
+ rItem.iPosition = (SHORT)nPos;
}
APIRET rc;
);
}
#endif
+
if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str());
wxLogLastError(wxT("Insert or AppendMenu"));
- return FALSE;
+ return false;
}
- else
+
+ //
+ // If we're already attached to the menubar, we must update it
+ //
+ if (IsAttached() && GetMenuBar()->IsAttached())
{
- //
- // If we're already attached to the menubar, we must update it
- //
- if (IsAttached() && GetMenuBar()->IsAttached())
- {
- GetMenuBar()->Refresh();
- }
- return TRUE;
+ GetMenuBar()->Refresh();
}
- return FALSE;
+
+ return true;
} // end of wxMenu::DoInsertOrAppend
void wxMenu::EndRadioGroup()
m_nStartRadioGroup = -1;
} // end of wxMenu::EndRadioGroup
-wxMenuItem* wxMenu::DoAppend(
- wxMenuItem* pItem
-)
+wxMenuItem* wxMenu::DoAppend( wxMenuItem* pItem )
{
wxCHECK_MSG( pItem, NULL, _T("NULL item in wxMenu::DoAppend") );
- bool bCheck = FALSE;
+ bool bCheck = false;
if (pItem->GetKind() == wxITEM_RADIO)
{
//
// Ensure that we have a checked item in the radio group
//
- bCheck = TRUE;
+ bCheck = true;
}
else // extend the current radio group
{
//
// Check the item initially
//
- pItem->Check(TRUE);
+ pItem->Check(true);
}
return pItem;
} // end of wxMenu::DoAppend
// set wxMenu title
// ---------------------------------------------------------------------------
-void wxMenu::SetTitle(
- const wxString& rLabel
-)
+void wxMenu::SetTitle( const wxString& rLabel )
{
- bool bHasNoTitle = m_title.IsEmpty();
- HWND hMenu = GetHmenu();
+ bool bHasNoTitle = m_title.empty();
+ HWND hMenu = GetHmenu();
m_title = rLabel;
if (bHasNoTitle)
{
- if (!rLabel.IsEmpty())
+ if (!rLabel.empty())
{
if (!::WinSetWindowText(hMenu, (PSZ)rLabel.c_str()))
{
}
else
{
- if (rLabel.IsEmpty() )
+ if (rLabel.empty() )
{
::WinSendMsg( GetHmenu()
,MM_REMOVEITEM
// event processing
// ---------------------------------------------------------------------------
-bool wxMenu::OS2Command(
- WXUINT WXUNUSED(uParam)
-, WXWORD vId
-)
+bool wxMenu::OS2Command( WXUINT WXUNUSED(uParam),
+ WXWORD vId )
{
//
// Ignore commands from the menu title
)
);
}
- return TRUE;
+ return true;
} // end of wxMenu::OS2Command
// ---------------------------------------------------------------------------
WXHMENU wxMenuBar::Create()
{
- HWND hFrame;
+ HWND hFrame;
if (m_hMenu != 0 )
return m_hMenu;
}
else
{
- size_t nCount = GetMenuCount(), i;
- wxMenuList::iterator it;
+ size_t nCount = GetMenuCount(), i;
+ wxMenuList::iterator it;
for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
{
- APIRET rc;
- ERRORID vError;
- wxString sError;
- HWND hSubMenu;
+ APIRET rc;
+ ERRORID vError;
+ wxString sError;
+ HWND hSubMenu;
//
// Set the parent and owner of the submenues to be the menubar, not the desktop
return NULLHANDLE;
}
- (*it)->m_vMenuData.iPosition = i;
+ (*it)->m_vMenuData.iPosition = (SHORT)i;
rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].c_str());
if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
return pMenuOld;
} // end of wxMenuBar::Replace
-bool wxMenuBar::Insert(
- size_t nPos
-, wxMenu* pMenu
-, const wxString& rTitle
-)
+bool wxMenuBar::Insert( size_t nPos,
+ wxMenu* pMenu,
+ const wxString& rTitle )
{
- wxString sTitle = wxPMTextToLabel(rTitle);
+ wxString sTitle = wxPMTextToLabel(rTitle);
- if (!wxMenuBarBase::Insert( nPos
- ,pMenu
- ,sTitle
- ))
- return FALSE;
+ if (!wxMenuBarBase::Insert( nPos, pMenu, sTitle ))
+ return false;
- m_titles.Insert( sTitle
- ,nPos
- );
+ m_titles.Insert( sTitle, nPos );
if (IsAttached())
{
- pMenu->m_vMenuData.iPosition = nPos;
+ pMenu->m_vMenuData.iPosition = (SHORT)nPos;
::WinSendMsg( (HWND)m_hMenu
,MM_INSERTITEM
,(MPARAM)&pMenu->m_vMenuData
#endif // wxUSE_ACCEL
Refresh();
}
- return TRUE;
+
+ return true;
} // end of wxMenuBar::Insert
-bool wxMenuBar::Append(
- wxMenu* pMenu
-, const wxString& rsTitle
-)
+bool wxMenuBar::Append( wxMenu* pMenu,
+ const wxString& rsTitle )
{
- WXHMENU hSubmenu = pMenu ? pMenu->GetHMenu() : 0;
+ WXHMENU hSubmenu = pMenu ? pMenu->GetHMenu() : 0;
- wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar"));
+ wxCHECK_MSG(hSubmenu, false, wxT("can't append invalid menu to menubar"));
- wxString sTitle = wxPMTextToLabel(rsTitle);
+ wxString sTitle = wxPMTextToLabel(rsTitle);
if (!wxMenuBarBase::Append(pMenu, sTitle))
- return FALSE;
+ return false;
m_titles.Add(sTitle);
#endif // wxUSE_ACCEL
Refresh();
}
- return TRUE;
+ return true;
} // end of wxMenuBar::Append
wxMenu* wxMenuBar::Remove(
}
return pItem;
} // end of wxMenuBar::FindItem
-
projects / wxWidgets.git / blobdiff