/////////////////////////////////////////////////////////////////////////////
-// 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"
//
// The (popup) menu title has this special id
//
-static const int idMenuTitle = -2;
+static const int idMenuTitle = -3;
//
// The unique ID for Menus
//
-#ifdef __VISAGECPP__
USHORT wxMenu::m_nextMenuId = 0;
-#else
-static USHORT wxMenu::m_nextMenuId = 0;
-#endif
// ----------------------------------------------------------------------------
// macros
IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-// ----------------------------------------------------------------------------
-// static function for translating menu labels
-// ----------------------------------------------------------------------------
-
-static wxString TextToLabel(
- const wxString& rsTitle
-)
-{
- wxString sTitle = "";
- const wxChar* zPc;
-
- if (rsTitle.IsEmpty())
- return sTitle;
- for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++ )
- {
- if (*zPc == wxT('&') )
- {
- if (*(zPc + 1) == wxT('&'))
- {
- zPc++;
- sTitle << wxT('&');
- }
- else
- sTitle << wxT('~');
- }
- else
- {
- if ( *zPc == wxT('~') )
- {
- //
- // Tildes must be doubled to prevent them from being
- // interpreted as accelerator character prefix by PM ???
- //
- sTitle << *zPc;
- }
- sTitle << *zPc;
- }
- }
- return sTitle;
-} // end of TextToLabel
-
// ============================================================================
// implementation
// ============================================================================
//
void wxMenu::Init()
{
- m_bDoBreak = FALSE;
+ m_bDoBreak = false;
m_nStartRadioGroup = -1;
//
,NULL
)) == 0)
{
- wxLogLastError("WinLoadMenu");
+ wxLogLastError(wxT("WinLoadMenu"));
}
m_vMenuData.iPosition = 0;
m_vMenuData.afStyle = MIS_SUBMENU | MIS_TEXT;
//
// 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
{
if (!::WinDestroyWindow((HWND)GetHmenu()) )
{
- wxLogLastError("WinDestroyWindow");
+ wxLogLastError(wxT("WinDestroyWindow"));
}
}
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(
if (pItem->IsSubMenu())
{
wxMenu* pSubmenu = pItem->GetSubMenu();
- wxMenuItemList::Node* pNode = pSubmenu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = pSubmenu->GetMenuItems().GetFirst();
- while (pNode)
+ while (node)
{
- UpdateAccel(pNode->GetData());
- pNode = pNode->GetNext();
+ UpdateAccel(node->GetData());
+ node = node->GetNext();
}
}
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
//
- wxAcceleratorEntry* pAccel = wxGetAccelFromString(pItem->GetText());
+ wxAcceleratorEntry* pAccel = wxAcceleratorEntry::Create(pItem->GetItemLabel());
if (pAccel)
pAccel->m_command = pItem->GetId();
//
size_t n = FindAccel(pItem->GetId());
- if (n == wxNOT_FOUND)
+ if (n == (size_t)wxNOT_FOUND)
{
//
// No old, add new if any
if (IsAttached())
{
- m_menuBar->RebuildAccelTable();
+ GetMenuBar()->RebuildAccelTable();
}
}
} // wxMenu::UpdateAccel
//
// 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;
- char zMsg[128];
+ ERRORID vError;
+ wxString sError;
#if wxUSE_ACCEL
UpdateAccel(pItem);
if (m_bDoBreak)
{
rItem.afStyle |= MIS_BREAK;
- m_bDoBreak = FALSE;
- }
-
- if (pItem->IsSeparator())
- {
- rItem.afStyle |= MIS_SEPARATOR;
+ m_bDoBreak = false;
}
//
// Id is the numeric id for normal menu items and HMENU for submenus as
// required by ::MM_INSERTITEM message API
//
-
if (pSubmenu != NULL)
{
wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
}
else
{
- rItem.id = pItem->GetId();
+ rItem.id = (USHORT)pItem->GetId();
}
- BYTE* pData;
+ char *pData = NULL;
#if wxUSE_OWNER_DRAWN
if (pItem->IsOwnerDrawn())
// Will eventually need to set the image handle somewhere into vItem.hItem
//
rItem.afStyle |= MIS_OWNERDRAW;
- pData = (BYTE*)NULL;
+ pData = NULL;
rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
pItem->m_vMenuData.afStyle = rItem.afStyle;
pItem->m_vMenuData.hItem = rItem.hItem;
}
else
#endif
+ if (pItem->IsSeparator())
{
- //
- // Menu is just a normal string (passed in data parameter)
- //
- rItem.afStyle |= MIS_TEXT;
- pData = (char*)pItem->GetText().c_str();
+ rItem.afStyle = MIS_SEPARATOR;
+ }
+ else
+ {
+ if (pItem->GetId() == idMenuTitle)
+ {
+ // Item is an unselectable title to be passed via pData
+ rItem.afStyle = MIS_STATIC;
+ }
+ else
+ {
+ //
+ // Menu is just a normal string (passed in data parameter)
+ //
+ rItem.afStyle |= MIS_TEXT;
+ }
+ pData = (char*) pItem->GetItemLabel().wx_str();
}
if (nPos == (size_t)-1)
}
else
{
- rItem.iPosition = nPos;
+ rItem.iPosition = (SHORT)nPos;
}
APIRET rc;
#if wxUSE_OWNER_DRAWN
if (pItem->IsOwnerDrawn())
{
- BOOL rc;
MENUITEM vMenuItem;
::WinSendMsg( GetHmenu()
);
}
#endif
- if (rc == MIT_MEMERROR || rc == MIT_ERROR)
+
+ if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError);
- wxLogLastError("Insert or AppendMenu");
- return FALSE;
+ wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str());
+ wxLogLastError(wxT("Insert or AppendMenu"));
+ 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() && m_menuBar->IsAttached())
- {
- m_menuBar->Refresh();
- }
- return TRUE;
+ GetMenuBar()->Refresh();
}
- return FALSE;
+
+ return true;
} // end of wxMenu::DoInsertOrAppend
void wxMenu::EndRadioGroup()
m_nStartRadioGroup = -1;
} // end of wxMenu::EndRadioGroup
-bool wxMenu::DoAppend(
- wxMenuItem* pItem
-)
+wxMenuItem* wxMenu::DoAppend( wxMenuItem* pItem )
{
- wxCHECK_MSG( pItem, FALSE, _T("NULL item in wxMenu::DoAppend") );
+ 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
{
//
pItem->SetRadioGroupStart(m_nStartRadioGroup);
- wxMenuItemList::Node* pNode = GetMenuItems().Item(m_nStartRadioGroup);
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_nStartRadioGroup);
- if (pNode)
+ if (node)
{
- pNode->GetData()->SetRadioGroupEnd(nCount);
+ node->GetData()->SetRadioGroupEnd(nCount);
}
else
{
if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem))
{
- return FALSE;
+ return NULL;
}
if (bCheck)
{
//
// Check the item initially
//
- pItem->Check(TRUE);
+ pItem->Check(true);
}
- return TRUE;
+ return pItem;
} // end of wxMenu::DoAppend
-bool wxMenu::DoInsert(
+wxMenuItem* wxMenu::DoInsert(
size_t nPos
, wxMenuItem* pItem
)
{
- return ( wxMenuBase::DoInsert( nPos
- ,pItem) &&
+ if ( wxMenuBase::DoInsert( nPos
+ ,pItem) &&
DoInsertOrAppend( pItem
,nPos
- )
- );
+ ))
+ return pItem;
+ else
+ return NULL;
} // end of wxMenu::DoInsert
wxMenuItem* wxMenu::DoRemove(
// We need to find the items position in the child list
//
size_t nPos;
- wxMenuItemList::Node* pNode = GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
- for (nPos = 0; pNode; nPos++)
+ for (nPos = 0; node; nPos++)
{
- if (pNode->GetData() == pItem)
+ if (node->GetData() == pItem)
break;
- pNode = pNode->GetNext();
+ node = node->GetNext();
}
//
// DoRemove() (unlike Remove) can only be called for existing item!
//
- wxCHECK_MSG(pNode, NULL, wxT("bug in wxMenu::Remove logic"));
+ wxCHECK_MSG(node, NULL, wxT("bug in wxMenu::Remove logic"));
#if wxUSE_ACCEL
//
,MPFROM2SHORT(pItem->GetId(), TRUE)
,(MPARAM)0
);
- if (IsAttached() && m_menuBar->IsAttached())
+ if (IsAttached() && GetMenuBar()->IsAttached())
{
//
// Otherwise, the chane won't be visible
//
- m_menuBar->Refresh();
+ GetMenuBar()->Refresh();
}
//
// 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, rLabel.c_str()))
{
- wxLogLastError("SetMenuTitle");
+ wxLogLastError(wxT("SetMenuTitle"));
}
}
}
else
{
- if (rLabel.IsEmpty() )
+ if (rLabel.empty() )
{
::WinSendMsg( GetHmenu()
,MM_REMOVEITEM
//
if (!::WinSetWindowText(hMenu, rLabel.c_str()))
{
- wxLogLastError("SetMenuTitle");
+ wxLogLastError(wxT("SetMenuTitle"));
}
}
}
// event processing
// ---------------------------------------------------------------------------
-bool wxMenu::OS2Command(
- WXUINT WXUNUSED(uParam)
-, WXWORD vId
-)
+bool wxMenu::OS2Command( WXUINT WXUNUSED(uParam),
+ WXWORD vId )
{
//
// Ignore commands from the menu title
SendEvent( vId
,(int)::WinSendMsg( GetHmenu()
,MM_QUERYITEMATTR
- ,(MPARAM)vId
+ ,MPFROMSHORT(vId)
,(MPARAM)MIA_CHECKED
)
);
}
- return TRUE;
+ return true;
} // end of wxMenu::OS2Command
// ---------------------------------------------------------------------------
{
if (m_invokingWindow != NULL)
return m_invokingWindow;
- else if ( m_menuBar != NULL)
- return m_menuBar->GetFrame();
+ else if ( GetMenuBar() != NULL)
+ return GetMenuBar()->GetFrame();
return NULL;
} // end of wxMenu::GetWindow
wxMenuItem* pItem = NULL;
- for ( wxMenuItemList::Node *node = m_items.GetFirst();
+ for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
node && !pItem;
node = node->GetNext() )
{
int nCount
, wxMenu* vMenus[]
, const wxString sTitles[]
+, long WXUNUSED(lStyle)
)
{
Init();
WXHMENU wxMenuBar::Create()
{
- MENUITEM vItem;
- HWND hFrame;
+ HWND hFrame;
if (m_hMenu != 0 )
return m_hMenu;
//
if ((m_hMenu = ::WinCreateWindow( hFrame
,WC_MENU
- ,(PSZ)NULL
+ ,NULL
,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE
,0L
,0L
,NULL
)) == 0)
{
- wxLogLastError("WinLoadMenu");
+ wxLogLastError(wxT("WinLoadMenu"));
}
else
{
- size_t nCount = GetMenuCount();
-
- for (size_t i = 0; i < nCount; i++)
+ 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
//
- hSubMenu = m_menus[i]->m_vMenuData.hwndSubMenu;
- if (!::WinSetParent(m_menus[i]->m_vMenuData.hwndSubMenu, m_hMenu, FALSE))
+ hSubMenu = (*it)->m_vMenuData.hwndSubMenu;
+ if (!::WinSetParent((*it)->m_vMenuData.hwndSubMenu, m_hMenu, FALSE))
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());
return NULLHANDLE;
}
- if (!::WinSetOwner(m_menus[i]->m_vMenuData.hwndSubMenu, m_hMenu))
+ if (!::WinSetOwner((*it)->m_vMenuData.hwndSubMenu, m_hMenu))
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());
return NULLHANDLE;
}
- m_menus[i]->m_vMenuData.iPosition = i;
+ (*it)->m_vMenuData.iPosition = (SHORT)i;
- rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (MPARAM)m_titles[i].c_str());
- if (rc == MIT_MEMERROR || rc == MIT_ERROR)
+ rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].wx_str());
+ if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError);
+ wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str());
return NULLHANDLE;
}
}
nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0));
if (nId == MIT_ERROR)
{
- wxLogLastError("LogLastError");
+ wxLogLastError(wxT("LogLastError"));
return;
}
::WinSendMsg((HWND)m_hMenu, MM_SETITEMATTR, MPFROM2SHORT(nId, TRUE), MPFROM2SHORT(MIA_DISABLED, uFlag));
Refresh();
} // end of wxMenuBar::EnableTop
-void wxMenuBar::SetLabelTop(
+void wxMenuBar::SetMenuLabel(
size_t nPos
, const wxString& rLabel
)
nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0));
if (nId == MIT_ERROR)
{
- wxLogLastError("LogLastError");
+ wxLogLastError(wxT("LogLastError"));
return;
}
if(!::WinSendMsg( (HWND)m_hMenu
,MPARAM(&vItem)
))
{
- wxLogLastError("QueryItem");
+ wxLogLastError(wxT("QueryItem"));
}
nId = vItem.id;
- if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.c_str()));
+ if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.wx_str()));
{
- wxLogLastError("ModifyMenu");
+ wxLogLastError(wxT("ModifyMenu"));
}
Refresh();
-} // end of wxMenuBar::SetLabelTop
+} // end of wxMenuBar::SetMenuLabel
-wxString wxMenuBar::GetLabelTop(
+wxString wxMenuBar::GetMenuLabel(
size_t nPos
) const
{
wxCHECK_MSG( nPos < GetMenuCount(), wxEmptyString,
- wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+ wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
return m_titles[nPos];
-} // end of wxMenuBar::GetLabelTop
+} // end of wxMenuBar::GetMenuLabel
// ---------------------------------------------------------------------------
// wxMenuBar construction
)
{
SHORT nId;
- wxString sTitle = TextToLabel(rTitle);
+ wxString sTitle = wxPMTextToLabel(rTitle);
wxMenu* pMenuOld = wxMenuBarBase::Replace( nPos
,pMenu
,sTitle
nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0));
if (nId == MIT_ERROR)
{
- wxLogLastError("LogLastError");
+ wxLogLastError(wxT("LogLastError"));
return NULL;
}
if (!pMenuOld)
if (IsAttached())
{
::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
- ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.c_str());
+ ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
#if wxUSE_ACCEL
if (pMenuOld->HasAccels() || pMenu->HasAccels())
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 = TextToLabel(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
- ,(MPARAM)sTitle.c_str()
+ ,(MPARAM)sTitle.wx_str()
);
#if wxUSE_ACCEL
if (pMenu->HasAccels())
#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 = TextToLabel(rsTitle);
+ wxString sTitle = wxPMTextToLabel(rsTitle);
if (!wxMenuBarBase::Append(pMenu, sTitle))
- return FALSE;
+ return false;
m_titles.Add(sTitle);
if ( IsAttached() )
{
pMenu->m_vMenuData.iPosition = MIT_END;
- ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.c_str());
+ ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
#if wxUSE_ACCEL
if (pMenu->HasAccels())
{
#endif // wxUSE_ACCEL
Refresh();
}
- return TRUE;
+ return true;
} // end of wxMenuBar::Append
wxMenu* wxMenuBar::Remove(
);
if (nId == MIT_ERROR)
{
- wxLogLastError("LogLastError");
+ wxLogLastError(wxT("LogLastError"));
return NULL;
}
if (IsAttached())
#endif // wxUSE_ACCEL
Refresh();
}
- m_titles.Remove(nPos);
+ m_titles.RemoveAt(nPos);
return pMenu;
} // end of wxMenuBar::Remove
size_t nAccelCount = 0;
size_t i;
size_t nCount = GetMenuCount();
-
- for (i = 0; i < nCount; i++)
+ wxMenuList::iterator it;
+ for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
{
- nAccelCount += m_menus[i]->GetAccelCount();
+ nAccelCount += (*it)->GetAccelCount();
}
if (nAccelCount)
wxAcceleratorEntry* pAccelEntries = new wxAcceleratorEntry[nAccelCount];
nAccelCount = 0;
- for (i = 0; i < nCount; i++)
+ for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
{
- nAccelCount += m_menus[i]->CopyAccels(&pAccelEntries[nAccelCount]);
+ nAccelCount += (*it)->CopyAccels(&pAccelEntries[nAccelCount]);
}
m_vAccelTable = wxAcceleratorTable( nAccelCount
,pAccelEntries
,m_vAccelTable.GetHACCEL()
,(HWND)pFrame->GetFrame()
))
- wxLogLastError("WinSetAccelTable");
+ wxLogLastError(wxT("WinSetAccelTable"));
#endif // wxUSE_ACCEL
} // end of wxMenuBar::Attach
) const
{
wxString sMenuLabel = wxStripMenuCodes(rMenuString);
- size_t nCount = GetMenuCount();
-
- for (size_t i = 0; i < nCount; i++)
+ size_t nCount = GetMenuCount(), i;
+ wxMenuList::const_iterator it;
+ for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
{
wxString sTitle = wxStripMenuCodes(m_titles[i]);
if (rMenuString == sTitle)
- return m_menus[i]->FindItem(rItemString);
+ return (*it)->FindItem(rItemString);
}
return wxNOT_FOUND;
} // end of wxMenuBar::FindMenuItem
*ppItemMenu = NULL;
wxMenuItem* pItem = NULL;
- size_t nCount = GetMenuCount();
-
- for (size_t i = 0; !pItem && (i < nCount); i++)
+ size_t nCount = GetMenuCount(), i;
+ wxMenuList::const_iterator it;
+ for (i = 0, it = m_menus.begin(); !pItem && (i < nCount); i++, it++)
{
- pItem = m_menus[i]->FindItem( nId
- ,ppItemMenu
- );
+ pItem = (*it)->FindItem( nId
+ ,ppItemMenu
+ );
}
return pItem;
} // end of wxMenuBar::FindItem
*ppItemMenu = NULL;
wxMenuItem* pItem = NULL;
- size_t nCount = GetMenuCount();
-
- for (size_t i = 0; !pItem && (i < nCount); i++)
+ size_t nCount = GetMenuCount(), i;
+ wxMenuList::const_iterator it;
+ for (i = 0, it = m_menus.begin(); !pItem && (i < nCount); i++, it++)
{
- pItem = m_menus[i]->FindItem( nId
- ,hItem
- ,ppItemMenu
- );
+ pItem = (*it)->FindItem( nId
+ ,hItem
+ ,ppItemMenu
+ );
}
return pItem;
} // end of wxMenuBar::FindItem
-
projects / wxWidgets.git / blobdiff