X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9923c37dccb4e5dbe6387ceb3ab0a8202fadc231..9894cc01c98b0d6fa960d57e9a6155bbb07ed67b:/src/os2/menu.cpp?ds=inline diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index 89d968065d..0d64df1bfd 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -47,7 +47,7 @@ extern wxMenu* wxCurrentPopupMenu; // // The (popup) menu title has this special id // -static const int idMenuTitle = -2; +static const int idMenuTitle = -3; // // The unique ID for Menus @@ -95,7 +95,7 @@ void wxMenu::Init() ,NULL )) == 0) { - wxLogLastError("WinLoadMenu"); + wxLogLastError(wxT("WinLoadMenu")); } m_vMenuData.iPosition = 0; m_vMenuData.afStyle = MIS_SUBMENU | MIS_TEXT; @@ -107,7 +107,7 @@ void wxMenu::Init() // // 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 @@ -131,7 +131,7 @@ wxMenu::~wxMenu() { if (!::WinDestroyWindow((HWND)GetHmenu()) ) { - wxLogLastError("WinDestroyWindow"); + wxLogLastError(wxT("WinDestroyWindow")); } } @@ -146,7 +146,7 @@ wxMenu::~wxMenu() 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( @@ -179,16 +179,28 @@ void wxMenu::UpdateAccel( 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 // @@ -226,7 +238,7 @@ void wxMenu::UpdateAccel( if (IsAttached()) { - m_menuBar->RebuildAccelTable(); + GetMenuBar()->RebuildAccelTable(); } } } // wxMenu::UpdateAccel @@ -236,17 +248,15 @@ void 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; + ERRORID vError; + wxString sError; #if wxUSE_ACCEL UpdateAccel(pItem); @@ -277,10 +287,10 @@ bool wxMenu::DoInsertOrAppend( } else { - rItem.id = pItem->GetId(); + rItem.id = (USHORT)pItem->GetId(); } - BYTE* pData; + BYTE* pData=NULL; #if wxUSE_OWNER_DRAWN if (pItem->IsOwnerDrawn()) @@ -304,10 +314,18 @@ bool wxMenu::DoInsertOrAppend( } else { - // - // Menu is just a normal string (passed in data parameter) - // - rItem.afStyle |= MIS_TEXT; + 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->GetText().c_str(); } @@ -317,7 +335,7 @@ bool wxMenu::DoInsertOrAppend( } else { - rItem.iPosition = nPos; + rItem.iPosition = (SHORT)nPos; } APIRET rc; @@ -341,26 +359,25 @@ bool wxMenu::DoInsertOrAppend( ); } #endif + 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.c_str()); - 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() @@ -371,13 +388,11 @@ 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) { @@ -399,7 +414,7 @@ wxMenuItem* wxMenu::DoAppend( // // Ensure that we have a checked item in the radio group // - bCheck = TRUE; + bCheck = true; } else // extend the current radio group { @@ -408,11 +423,11 @@ wxMenuItem* wxMenu::DoAppend( // 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 { @@ -434,7 +449,7 @@ wxMenuItem* wxMenu::DoAppend( // // Check the item initially // - pItem->Check(TRUE); + pItem->Check(true); } return pItem; } // end of wxMenu::DoAppend @@ -462,19 +477,19 @@ 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 // @@ -497,12 +512,12 @@ wxMenuItem* wxMenu::DoRemove( ,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(); } // @@ -540,27 +555,25 @@ size_t wxMenu::CopyAccels( // 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())) + if (!::WinSetWindowText(hMenu, (PSZ)rLabel.c_str())) { - wxLogLastError("SetMenuTitle"); + wxLogLastError(wxT("SetMenuTitle")); } } } else { - if (rLabel.IsEmpty() ) + if (rLabel.empty() ) { ::WinSendMsg( GetHmenu() ,MM_REMOVEITEM @@ -573,9 +586,9 @@ void wxMenu::SetTitle( // // Modify the title // - if (!::WinSetWindowText(hMenu, rLabel.c_str())) + if (!::WinSetWindowText(hMenu, (PSZ)rLabel.c_str())) { - wxLogLastError("SetMenuTitle"); + wxLogLastError(wxT("SetMenuTitle")); } } } @@ -615,8 +628,8 @@ wxWindow* wxMenu::GetWindow() const { 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 @@ -633,7 +646,7 @@ wxMenuItem* wxMenu::FindItem( wxMenuItem* pItem = NULL; - for ( wxMenuItemList::Node *node = m_items.GetFirst(); + for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); node && !pItem; node = node->GetNext() ) { @@ -689,6 +702,7 @@ wxMenuBar::wxMenuBar( int nCount , wxMenu* vMenus[] , const wxString sTitles[] +, long WXUNUSED(lStyle) ) { Init(); @@ -760,47 +774,47 @@ WXHMENU wxMenuBar::Create() ,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.c_str()); + 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.c_str()); + 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()); + 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) { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError.c_str()); + wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str()); return NULLHANDLE; } } @@ -831,7 +845,7 @@ void wxMenuBar::EnableTop( 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)); @@ -857,7 +871,7 @@ void wxMenuBar::SetLabelTop( 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 @@ -866,13 +880,13 @@ void wxMenuBar::SetLabelTop( ,MPARAM(&vItem) )) { - wxLogLastError("QueryItem"); + wxLogLastError(wxT("QueryItem")); } nId = vItem.id; if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.c_str())); { - wxLogLastError("ModifyMenu"); + wxLogLastError(wxT("ModifyMenu")); } Refresh(); } // end of wxMenuBar::SetLabelTop @@ -907,7 +921,7 @@ wxMenu* wxMenuBar::Replace( 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) @@ -932,27 +946,20 @@ wxMenu* wxMenuBar::Replace( 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 @@ -967,7 +974,8 @@ bool wxMenuBar::Insert( #endif // wxUSE_ACCEL Refresh(); } - return TRUE; + + return true; } // end of wxMenuBar::Insert bool wxMenuBar::Append( @@ -1021,7 +1029,7 @@ wxMenu* wxMenuBar::Remove( ); if (nId == MIT_ERROR) { - wxLogLastError("LogLastError"); + wxLogLastError(wxT("LogLastError")); return NULL; } if (IsAttached()) @@ -1043,7 +1051,7 @@ wxMenu* wxMenuBar::Remove( #endif // wxUSE_ACCEL Refresh(); } - m_titles.Remove(nPos); + m_titles.RemoveAt(nPos); return pMenu; } // end of wxMenuBar::Remove @@ -1057,10 +1065,10 @@ void wxMenuBar::RebuildAccelTable() 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) @@ -1068,9 +1076,9 @@ void wxMenuBar::RebuildAccelTable() 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 @@ -1096,7 +1104,7 @@ void wxMenuBar::Attach( ,m_vAccelTable.GetHACCEL() ,(HWND)pFrame->GetFrame() )) - wxLogLastError("WinSetAccelTable"); + wxLogLastError(wxT("WinSetAccelTable")); #endif // wxUSE_ACCEL } // end of wxMenuBar::Attach @@ -1120,14 +1128,14 @@ int wxMenuBar::FindMenuItem( ) 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 @@ -1141,13 +1149,13 @@ wxMenuItem* 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 - ,ppItemMenu - ); + pItem = (*it)->FindItem( nId + ,ppItemMenu + ); } return pItem; } // end of wxMenuBar::FindItem @@ -1162,15 +1170,14 @@ wxMenuItem* 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 -