X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0367c1c0e82c6da38cea16c4bcef6583271789cc..6d9022fe3bb50a75b9b5eaf5cf32558e518ba310:/src/os2/menu.cpp diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index e93d89adc4..5f4ba30bb4 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -73,7 +73,7 @@ static wxString TextToLabel(const wxString& rTitle) { wxString Title; const wxChar *pc; - for (pc = rTitle; *pc != wxT('\0'); pc++ ) + for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ ) { if (*pc == wxT('&') ) { @@ -85,10 +85,6 @@ static wxString TextToLabel(const wxString& rTitle) else Title << wxT('~'); } -// else if (*pc == wxT('/')) -// { -// Title << wxT('\\'); -// } else { if ( *pc == wxT('~') ) @@ -117,6 +113,7 @@ static wxString TextToLabel(const wxString& rTitle) void wxMenu::Init() { m_bDoBreak = FALSE; + m_nStartRadioGroup = -1; // // Create the menu (to be used as a submenu or a popup) @@ -178,9 +175,7 @@ wxMenu::~wxMenu() // // Delete accels // -#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) WX_CLEAR_ARRAY(m_vAccels); -#endif #endif // wxUSE_ACCEL } // end of wxMenu::~wxMenu @@ -190,6 +185,14 @@ void wxMenu::Break() m_bDoBreak = TRUE; } // end of wxMenu::Break +void wxMenu::Attach( + wxMenuBarBase* pMenubar +) +{ + wxMenuBase::Attach(pMenubar); + EndRadioGroup(); +} // end of wxMenu::Break; + #if wxUSE_ACCEL int wxMenu::FindAccel( @@ -200,10 +203,8 @@ int wxMenu::FindAccel( size_t nCount = m_vAccels.GetCount(); for (n = 0; n < nCount; n++) - { if (m_vAccels[n]->m_command == nId) return n; - } return wxNOT_FOUND; } // end of wxMenu::FindAccel @@ -211,45 +212,58 @@ void wxMenu::UpdateAccel( 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) + m_vAccels.Add(pAccel); + else + return; + } else - m_vAccels.Remove(n); - } + { + // + // Replace old with new or just remove the old one if no new + // + delete m_vAccels[n]; + if (pAccel) + m_vAccels[n] = pAccel; + else + m_vAccels.RemoveAt(n); + } - if (IsAttached()) - { - m_menuBar->RebuildAccelTable(); + if (IsAttached()) + { + m_menuBar->RebuildAccelTable(); + } } } // wxMenu::UpdateAccel @@ -263,6 +277,10 @@ bool wxMenu::DoInsertOrAppend( , size_t nPos ) { + wxMenu* pSubmenu = pItem->GetSubMenu(); + MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData: + pItem->m_vMenuData; + ERRORID vError; wxString sError; char zMsg[128]; @@ -275,9 +293,6 @@ bool wxMenu::DoInsertOrAppend( // 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")); @@ -398,12 +413,81 @@ bool wxMenu::DoInsertOrAppend( return FALSE; } // end of wxMenu::DoInsertOrAppend +void wxMenu::EndRadioGroup() +{ + // + // We're not inside a radio group any longer + // + m_nStartRadioGroup = -1; +} // end of wxMenu::EndRadioGroup + bool wxMenu::DoAppend( 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) + { + // + // Check the item initially + // + pItem->Check(TRUE); + } + return TRUE; +} // end of wxMenu::DoAppend bool wxMenu::DoInsert( size_t nPos @@ -414,7 +498,8 @@ bool wxMenu::DoInsert( ,pItem) && DoInsertOrAppend( pItem ,nPos - )); + ) + ); } // end of wxMenu::DoInsert wxMenuItem* wxMenu::DoRemove( @@ -448,7 +533,7 @@ wxMenuItem* wxMenu::DoRemove( if (n != wxNOT_FOUND) { delete m_vAccels[n]; - m_vAccels.Remove(n); + m_vAccels.RemoveAt(n); } #endif // wxUSE_ACCEL @@ -609,7 +694,12 @@ wxMenuItem* wxMenu::FindItem( } else if ( pItem->IsSubMenu() ) { - pItem = pItem->GetSubMenu()->FindItem(nItemId, hItem, ppItemMenu); + pItem = pItem->GetSubMenu()->FindItem( nItemId + ,hItem + ,ppItemMenu + ); + if (pItem) + break; } else { @@ -627,7 +717,7 @@ wxMenuItem* wxMenu::FindItem( void wxMenuBar::Init() { m_eventHandler = this; - m_pMenuBarFrame = NULL; + m_menuBarFrame = NULL; m_hMenu = 0; } // end of wxMenuBar::Init @@ -672,7 +762,7 @@ void wxMenuBar::Refresh() { 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() @@ -688,8 +778,8 @@ 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; // @@ -899,8 +989,6 @@ bool wxMenuBar::Insert( ,nPos ); - pMenu->Attach(this); - if (IsAttached()) { ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str()); @@ -929,7 +1017,6 @@ bool wxMenuBar::Append( if (!wxMenuBarBase::Append(pMenu, Title)) return FALSE; - pMenu->Attach(this); m_titles.Add(Title); if ( IsAttached() ) @@ -969,7 +1056,6 @@ wxMenu* wxMenuBar::Remove( if (IsAttached()) { ::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); - pMenu->Detach(); #if wxUSE_ACCEL if (pMenu->HasAccels()) @@ -1024,8 +1110,7 @@ void wxMenuBar::Attach( wxFrame* pFrame ) { - wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") ); - m_pMenuBarFrame = pFrame; + wxMenuBarBase::Attach(pFrame); #if wxUSE_ACCEL RebuildAccelTable(); @@ -1033,8 +1118,8 @@ void wxMenuBar::Attach( // Ensure the accelerator table is set to the frame (not the client!) // if (!::WinSetAccelTable( vHabmain - ,(HWND)pFrame->GetHWND() ,m_vAccelTable.GetHACCEL() + ,(HWND)pFrame->GetFrame() )) wxLogLastError("WinSetAccelTable"); #endif // wxUSE_ACCEL @@ -1044,7 +1129,7 @@ void wxMenuBar::Detach() { ::WinDestroyWindow((HWND)m_hMenu); m_hMenu = (WXHMENU)NULL; - m_pMenuBarFrame = NULL; + m_menuBarFrame = NULL; } // end of wxMenuBar::Detach // ---------------------------------------------------------------------------