{
wxString Title;
const wxChar *pc;
- for (pc = rTitle; *pc != wxT('\0'); pc++ )
+ for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ )
{
if (*pc == wxT('&') )
{
else
Title << wxT('~');
}
-// else if (*pc == wxT('/'))
-// {
-// Title << wxT('\\');
-// }
else
{
if ( *pc == wxT('~') )
);
AppendSeparator();
}
+ for (int i = 0; i < 128; i++)
+ m_vAccels[i] = NULL;
+ m_nNextAccel = 0;
} // end of wxMenu::Init
//
// Delete accels
//
#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))
- WX_CLEAR_ARRAY(m_vAccels);
+ for (int i = 0; i < 128; i++)
+ {
+ if (m_vAccels[i])
+ {
+ delete m_vAccels[i];
+ m_vAccels[i] = NULL;
+ }
+ }
+// WX_CLEAR_ARRAY(m_vAccels);
#endif
#endif // wxUSE_ACCEL
} // end of wxMenu::~wxMenu
#if wxUSE_ACCEL
+void wxMenu::EndRadioGroup()
+{
+ //
+ // We're not inside a radio group any longer
+ //
+ m_nStartRadioGroup = -1;
+} // end of wxMenu::EndRadioGroup
+
int wxMenu::FindAccel(
int nId
) const
{
size_t n;
- size_t nCount = m_vAccels.GetCount();
+// size_t nCount = m_vAccels.GetCount();
- for (n = 0; n < nCount; n++)
+ for (n = 0; n < m_nNextAccel; n++)
{
- if (m_vAccels[n]->m_command == nId)
- return n;
+ if (m_vAccels[n] != NULL)
+ {
+ if (m_vAccels[n]->m_command == nId)
+ return n;
+ }
}
return wxNOT_FOUND;
} // end of wxMenu::FindAccel
wxMenuItem* pItem
)
{
- //
- // Find the (new) accel for this item
- //
- wxAcceleratorEntry* pAccel = wxGetAccelFromString(pItem->GetText());
-
- if (pAccel)
- pAccel->m_command = pItem->GetId();
-
- //
- // Find the old one
- //
- int n = FindAccel(pItem->GetId());
+ if (pItem->IsSubMenu())
+ {
+ wxMenu* pSubmenu = pItem->GetSubMenu();
+ wxMenuItemList::Node* pNode = pSubmenu->GetMenuItems().GetFirst();
- if (n == wxNOT_FOUND)
+ while (pNode)
+ {
+ UpdateAccel(pNode->GetData());
+ pNode = pNode->GetNext();
+ }
+ }
+ else if (!pItem->IsSeparator())
{
//
- // No old, add new if any
+ // Find the (new) accel for this item
//
+ wxAcceleratorEntry* pAccel = wxGetAccelFromString(pItem->GetText());
if (pAccel)
- m_vAccels.Add(pAccel);
- else
- return; // skipping RebuildAccelTable() below
- }
- else
- {
+ pAccel->m_command = pItem->GetId();
+
//
- // Replace old with new or just remove the old one if no new
+ // Find the old one
//
- delete m_vAccels[n];
+ size_t n = FindAccel(pItem->GetId());
- if (pAccel)
- m_vAccels[n] = pAccel;
+ if (n == wxNOT_FOUND)
+ {
+ //
+ // No old, add new if any
+ //
+ if (pAccel)
+ {
+ if (m_nNextAccel < 128)
+ {
+ m_vAccels[m_nNextAccel] = pAccel;
+ m_nNextAccel++;
+ }
+ else
+ return; // skipping RebuildAccelTable() below
+ }
+ else
+ return; // skipping RebuildAccelTable() below
+ }
else
- m_vAccels.Remove(n);
- }
+ {
+ //
+ // Replace old with new or just remove the old one if no new
+ //
+ delete m_vAccels[n];
+ m_vAccels[n] = NULL;
- if (IsAttached())
- {
- m_menuBar->RebuildAccelTable();
+ if (pAccel)
+ m_vAccels[n] = pAccel;
+ }
+
+ if (IsAttached())
+ {
+ m_menuBar->RebuildAccelTable();
+ }
}
} // wxMenu::UpdateAccel
, size_t nPos
)
{
+ wxMenu* pSubmenu = pItem->GetSubMenu();
+ MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
+ pItem->m_vMenuData;
+
ERRORID vError;
wxString sError;
char zMsg[128];
// MENUITEM for submenus as required by ::MM_INSERTITEM message API
//
- wxMenu* pSubmenu = pItem->GetSubMenu();
- MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
- pItem->m_vMenuData;
if(pSubmenu != NULL)
{
wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
// Will eventually need to set the image handle somewhere into vItem.hItem
//
rItem.afStyle |= MIS_OWNERDRAW;
- pData = (BYTE*)pItem;
+ pData = (BYTE*)NULL;
rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
pItem->m_vMenuData.afStyle = rItem.afStyle;
pItem->m_vMenuData.hItem = rItem.hItem;
//
// If we're already attached to the menubar, we must update it
//
- if (IsAttached())
+ if (IsAttached() && m_menuBar->IsAttached())
{
m_menuBar->Refresh();
}
wxMenuItem* pItem
)
{
- return wxMenuBase::DoAppend(pItem) && DoInsertOrAppend(pItem);
-}
+ wxCHECK_MSG( pItem, FALSE, _T("NULL item in wxMenu::DoAppend") );
+
+ bool bCheck = FALSE;
+
+ if (pItem->GetKind() == wxITEM_RADIO)
+ {
+ int nCount = GetMenuItemCount();
+
+ if (m_nStartRadioGroup == -1)
+ {
+ //
+ // Start a new radio group
+ //
+ m_nStartRadioGroup = nCount;
+
+ //
+ // For now it has just one element
+ //
+ pItem->SetAsRadioGroupStart();
+ pItem->SetRadioGroupEnd(m_nStartRadioGroup);
+
+ //
+ // Ensure that we have a checked item in the radio group
+ //
+ bCheck = TRUE;
+ }
+ else // extend the current radio group
+ {
+ //
+ // We need to update its end item
+ //
+ pItem->SetRadioGroupStart(m_nStartRadioGroup);
+ wxMenuItemList::Node* pNode = GetMenuItems().Item(m_nStartRadioGroup);
+
+ if (pNode)
+ {
+ pNode->GetData()->SetRadioGroupEnd(nCount);
+ }
+ else
+ {
+ wxFAIL_MSG( _T("where is the radio group start item?") );
+ }
+ }
+ }
+ else // not a radio item
+ {
+ EndRadioGroup();
+ }
+ if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem))
+ {
+ return FALSE;
+ }
+ if (bCheck)
+ {
+ pItem->Check(TRUE);
+ }
+ return TRUE;
+} // end of wxMenu::DoInsert
bool wxMenu::DoInsert(
size_t nPos
if (n != wxNOT_FOUND)
{
delete m_vAccels[n];
- m_vAccels.Remove(n);
+ m_vAccels[n] = NULL;
}
#endif // wxUSE_ACCEL
,MPFROM2SHORT(pItem->GetId(), TRUE)
,(MPARAM)0
);
- if (IsAttached())
+ if (IsAttached() && m_menuBar->IsAttached())
{
//
// Otherwise, the chane won't be visible
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)
}
else if ( pItem->IsSubMenu() )
{
- pItem = pItem->GetSubMenu()->FindItem(nItemId, hItem, ppItemMenu);
+ pItem = pItem->GetSubMenu()->FindItem( nItemId
+ ,hItem
+ ,ppItemMenu
+ );
+ if (pItem)
+ break;
}
else
{
void wxMenuBar::Init()
{
m_eventHandler = this;
- m_pMenuBarFrame = NULL;
+ m_menuBarFrame = NULL;
m_hMenu = 0;
} // end of wxMenuBar::Init
{
wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
- WinSendMsg(GetWinHwnd(m_pMenuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ WinSendMsg(GetWinHwnd(m_menuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxMenuBar::Refresh
WXHMENU wxMenuBar::Create()
//
// Menubars should be associated with a frame otherwise they are popups
//
- if (m_pMenuBarFrame != NULL)
- hFrame = GetWinHwnd(m_pMenuBarFrame);
+ if (m_menuBarFrame != NULL)
+ hFrame = GetWinHwnd(m_menuBarFrame);
else
hFrame = HWND_DESKTOP;
//
,nPos
);
- pMenu->Attach(this);
-
if (IsAttached())
{
::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
if (!wxMenuBarBase::Append(pMenu, Title))
return FALSE;
- pMenu->Attach(this);
m_titles.Add(Title);
if ( IsAttached() )
if (IsAttached())
{
::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
- pMenu->Detach();
#if wxUSE_ACCEL
if (pMenu->HasAccels())
)
{
wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
- m_pMenuBarFrame = pFrame;
#if wxUSE_ACCEL
RebuildAccelTable();
{
::WinDestroyWindow((HWND)m_hMenu);
m_hMenu = (WXHMENU)NULL;
- m_pMenuBarFrame = NULL;
+ m_menuBarFrame = NULL;
} // end of wxMenuBar::Detach
// ---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff