// macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
- IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
// ============================================================================
// implementation
m_hMenu = (WXHMENU)CreatePopupMenu();
if ( !m_hMenu )
{
- wxLogLastError("CreatePopupMenu");
+ wxLogLastError(wxT("CreatePopupMenu"));
}
// if we have a title, insert it in the beginning of the menu
{
if ( !::DestroyMenu(GetHmenu()) )
{
- wxLogLastError("DestroyMenu");
+ wxLogLastError(wxT("DestroyMenu"));
}
}
void wxMenu::UpdateAccel(wxMenuItem *item)
{
- // find the (new) accel for this item
- wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());
- if ( accel )
- accel->m_command = item->GetId();
-
- // find the old one
- int n = FindAccel(item->GetId());
- if ( n == wxNOT_FOUND )
+ if ( item->IsSubMenu() )
{
- // no old, add new if any
- if ( accel )
- m_accels.Add(accel);
- else
- return; // skipping RebuildAccelTable() below
+ wxMenu *submenu = item->GetSubMenu();
+ wxMenuItemList::Node *node = submenu->GetMenuItems().GetFirst();
+ while ( node )
+ {
+ UpdateAccel(node->GetData());
+
+ node = node->GetNext();
+ }
}
- else
+ else if ( !item->IsSeparator() )
{
- // replace old with new or just remove the old one if no new
- delete m_accels[n];
+ // find the (new) accel for this item
+ wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());
if ( accel )
- m_accels[n] = accel;
+ accel->m_command = item->GetId();
+
+ // find the old one
+ int n = FindAccel(item->GetId());
+ if ( n == wxNOT_FOUND )
+ {
+ // no old, add new if any
+ if ( accel )
+ m_accels.Add(accel);
+ else
+ return; // skipping RebuildAccelTable() below
+ }
else
- m_accels.Remove(n);
- }
+ {
+ // replace old with new or just remove the old one if no new
+ delete m_accels[n];
+ if ( accel )
+ m_accels[n] = accel;
+ else
+ m_accels.Remove(n);
+ }
- if ( IsAttached() )
- {
- m_menuBar->RebuildAccelTable();
+ if ( IsAttached() )
+ {
+ m_menuBar->RebuildAccelTable();
+ }
}
+ //else: it is a separator, they can't have accels, nothing to do
}
#endif // wxUSE_ACCEL
// menu is just a normal string (passed in data parameter)
flags |= MF_STRING;
- pData = (char*)pItem->GetText().c_str();
+ pData = (wxChar*)pItem->GetText().c_str();
}
BOOL ok;
if ( !ok )
{
- wxLogLastError("Insert or AppendMenu");
+ wxLogLastError(wxT("Insert or AppendMenu"));
return FALSE;
}
#endif // __WIN32__
// if we're already attached to the menubar, we must update it
- if ( IsAttached() )
+ if ( IsAttached() && m_menuBar->IsAttached() )
{
m_menuBar->Refresh();
}
// remove the item from the menu
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
- wxLogLastError("RemoveMenu");
+ wxLogLastError(wxT("RemoveMenu"));
}
- if ( IsAttached() )
+ if ( IsAttached() && m_menuBar->IsAttached() )
{
// otherwise, the chane won't be visible
m_menuBar->Refresh();
(unsigned)idMenuTitle, m_title) ||
!::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
{
- wxLogLastError("InsertMenu");
+ wxLogLastError(wxT("InsertMenu"));
}
}
}
if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
!RemoveMenu(hMenu, 0, MF_BYPOSITION) )
{
- wxLogLastError("RemoveMenu");
+ wxLogLastError(wxT("RemoveMenu"));
}
}
else
MF_BYPOSITION | MF_STRING,
(unsigned)idMenuTitle, m_title) )
{
- wxLogLastError("ModifyMenu");
+ wxLogLastError(wxT("ModifyMenu"));
}
}
}
if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) )
{
- wxLogLastError("SetMenuItemInfo");
+ wxLogLastError(wxT("SetMenuItemInfo"));
}
}
#endif // Win32
wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
event.SetEventObject( this );
event.SetId( id );
- event.SetInt( id );
+
+ // VZ: previosuly, the command int was set to id too which was quite
+ // useless anyhow (as it could be retrieved using GetId()) and
+ // uncompatible with wxGTK, so now we use the command int instead
+ // to pass the checked status
+ event.SetInt(::GetMenuState(GetHmenu(), id, MF_BYCOMMAND) & MF_CHECKED);
+
ProcessCommand(event);
}
{
bool processed = FALSE;
-#if WXWIN_COMPATIBILITY
+#if wxUSE_MENU_CALLBACK
// Try a callback
if (m_callback)
{
(void)(*(m_callback))(*this, event);
processed = TRUE;
}
-#endif WXWIN_COMPATIBILITY
+#endif // wxUSE_MENU_CALLBACK
// Try the menu's event handler
if ( !processed && GetEventHandler())
void wxMenuBar::Refresh()
{
- wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
+ wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
DrawMenuBar(GetHwndOf(m_menuBarFrame));
}
WXHMENU wxMenuBar::Create()
{
- if (m_hMenu != 0 )
+ if ( m_hMenu != 0 )
return m_hMenu;
- wxCHECK_MSG( !m_hMenu, TRUE, wxT("menubar already created") );
-
m_hMenu = (WXHMENU)::CreateMenu();
if ( !m_hMenu )
{
- wxLogLastError("CreateMenu");
+ wxLogLastError(wxT("CreateMenu"));
}
else
{
(UINT)m_menus[i]->GetHMenu(),
m_titles[i]) )
{
- wxLogLastError("AppendMenu");
+ wxLogLastError(wxT("AppendMenu"));
}
}
}
if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld,
id, label) == (int)0xFFFFFFFF )
{
- wxLogLastError("ModifyMenu");
+ wxLogLastError(wxT("ModifyMenu"));
}
Refresh();
return m_titles[pos];
}
-int wxMenuBar::FindMenu(const wxString& title)
-{
- wxString menuTitle = wxStripMenuCodes(title);
-
- size_t count = GetMenuCount();
- for ( size_t i = 0; i < count; i++ )
- {
- wxString title = wxStripMenuCodes(m_titles[i]);
- if ( menuTitle == title )
- return i;
- }
-
- return wxNOT_FOUND;
-
-}
-
// ---------------------------------------------------------------------------
// wxMenuBar construction
// ---------------------------------------------------------------------------
// can't use ModifyMenu() because it deletes the submenu it replaces
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
- wxLogLastError("RemoveMenu");
+ wxLogLastError(wxT("RemoveMenu"));
}
if ( !::InsertMenu(GetHmenu(), (UINT)pos,
MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)GetHmenuOf(menu), title) )
{
- wxLogLastError("InsertMenu");
+ wxLogLastError(wxT("InsertMenu"));
}
#if wxUSE_ACCEL
MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)GetHmenuOf(menu), title) )
{
- wxLogLastError("InsertMenu");
+ wxLogLastError(wxT("InsertMenu"));
}
#if wxUSE_ACCEL
{
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
- wxLogLastError("RemoveMenu");
+ wxLogLastError(wxT("RemoveMenu"));
}
menu->Detach();
void wxMenuBar::Attach(wxFrame *frame)
{
- wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
+// wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
m_menuBarFrame = frame;
for ( size_t i = 0; i < count; i++ )
{
wxString title = wxStripMenuCodes(m_titles[i]);
- if ( menuString == title )
+ if ( menuLabel == title )
return m_menus[i]->FindItem(itemString);
}
projects / wxWidgets.git / blobdiff