X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f95255e2e7e617ffc48d9d83c6aa1f922ea85b8d..6ba718d7aee2f519d9146b90424ccec9e2243479:/src/os2/menu.cpp diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index 2ed0039e5a..1360bf6430 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -1,25 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/os2/menu.cpp // Purpose: wxMenu, wxMenuBar, wxMenuItem // Author: David Webster // Modified by: // Created: 10/10/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // 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" @@ -47,58 +43,17 @@ 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 // -#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& rTitle) -{ - wxString Title; - const wxChar *pc; - for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ ) - { - if (*pc == wxT('&') ) - { - if (*(pc+1) == wxT('&')) - { - pc++; - Title << wxT('&'); - } - else - Title << wxT('~'); - } - else - { - if ( *pc == wxT('~') ) - { - // tildes must be doubled to prevent them from being - // interpreted as accelerator character prefix by PM ??? - Title << *pc; - } - Title << *pc; - } - } - return Title; -} - // ============================================================================ // implementation // ============================================================================ @@ -112,7 +67,8 @@ static wxString TextToLabel(const wxString& rTitle) // void wxMenu::Init() { - m_bDoBreak = FALSE; + m_bDoBreak = false; + m_nStartRadioGroup = -1; // // Create the menu (to be used as a submenu or a popup) @@ -132,7 +88,7 @@ void wxMenu::Init() ,NULL )) == 0) { - wxLogLastError("WinLoadMenu"); + wxLogLastError(wxT("WinLoadMenu")); } m_vMenuData.iPosition = 0; m_vMenuData.afStyle = MIS_SUBMENU | MIS_TEXT; @@ -144,10 +100,12 @@ 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 + ,wxEmptyString + ,wxITEM_NORMAL ); AppendSeparator(); } @@ -166,7 +124,7 @@ wxMenu::~wxMenu() { if (!::WinDestroyWindow((HWND)GetHmenu()) ) { - wxLogLastError("WinDestroyWindow"); + wxLogLastError(wxT("WinDestroyWindow")); } } @@ -174,18 +132,24 @@ wxMenu::~wxMenu() // // Delete accels // -#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) WX_CLEAR_ARRAY(m_vAccels); -#endif #endif // wxUSE_ACCEL } // end of 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( + wxMenuBarBase* pMenubar +) +{ + wxMenuBase::Attach(pMenubar); + EndRadioGroup(); +} // end of wxMenu::Break; + #if wxUSE_ACCEL int wxMenu::FindAccel( @@ -196,10 +160,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 @@ -207,45 +169,70 @@ 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::compatibility_iterator node = pSubmenu->GetMenuItems().GetFirst(); - if (n == wxNOT_FOUND) + while (node) + { + UpdateAccel(node->GetData()); + node = node->GetNext(); + } + } + else if (!pItem->IsSeparator()) { // - // No old, add new if any + // 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 (pAccel) - m_vAccels.Add(pAccel); - else - return; // skipping RebuildAccelTable() below - } - else - { + if (GetParent()) + { + GetParent()->UpdateAccel(pItem); + return; + } + // - // Replace old with new or just remove the old one if no new + // Find the (new) accel for this item // - delete m_vAccels[n]; + wxAcceleratorEntry* pAccel = wxAcceleratorEntry::Create(pItem->GetItemLabel()); if (pAccel) - m_vAccels[n] = pAccel; + pAccel->m_command = pItem->GetId(); + + // + // Find the old one + // + size_t n = FindAccel(pItem->GetId()); + + if (n == (size_t)wxNOT_FOUND) + { + // + // No old, add new if any + // + if (pAccel) + m_vAccels.Add(pAccel); + else + return; + } else - m_vAccels.RemoveAt(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()) + { + GetMenuBar()->RebuildAccelTable(); + } } } // wxMenu::UpdateAccel @@ -254,33 +241,20 @@ 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 ) { - ERRORID vError; - wxString sError; - char zMsg[128]; + wxMenu* pSubmenu = pItem->GetSubMenu(); + MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData: + pItem->m_vMenuData; + + ERRORID vError; + wxString sError; + #if wxUSE_ACCEL UpdateAccel(pItem); #endif // wxUSE_ACCEL - // - // rItem is the member MENUITEM for the menu items and the submenu's - // 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")); - pSubmenu->SetParent(this); - rItem.afStyle |= MIS_SUBMENU | MIS_TEXT; - } - // // If "Break" has just been called, insert a menu break before this item // (and don't forget to reset the flag) @@ -288,34 +262,28 @@ bool wxMenu::DoInsertOrAppend( 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")); pSubmenu->SetParent(this); rItem.iPosition = 0; // submenus have a 0 position - rItem.id = (USHORT)pSubmenu->GetHMenu(); - rItem.afStyle |= MIS_SUBMENU | MIS_TEXT; + rItem.id = (USHORT)pSubmenu->GetHMenu(); + rItem.afStyle |= MIS_SUBMENU | MIS_TEXT; } else { - rItem.id = pItem->GetId(); + rItem.id = (USHORT)pItem->GetId(); } - BYTE* pData; + char *pData = NULL; #if wxUSE_OWNER_DRAWN if (pItem->IsOwnerDrawn()) @@ -325,20 +293,33 @@ bool wxMenu::DoInsertOrAppend( // item draws itself, passing pointer to data doesn't work in OS/2 // Will eventually need to set the image handle somewhere into vItem.hItem // - rItem.afStyle |= MIS_OWNERDRAW; - pData = (BYTE*)NULL; - rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP(); + rItem.afStyle |= MIS_OWNERDRAW; + pData = NULL; + rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP(); pItem->m_vMenuData.afStyle = rItem.afStyle; - pItem->m_vMenuData.hItem = rItem.hItem; + 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) @@ -347,7 +328,7 @@ bool wxMenu::DoInsertOrAppend( } else { - rItem.iPosition = nPos; + rItem.iPosition = (SHORT)nPos; } APIRET rc; @@ -360,7 +341,6 @@ bool wxMenu::DoInsertOrAppend( #if wxUSE_OWNER_DRAWN if (pItem->IsOwnerDrawn()) { - BOOL rc; MENUITEM vMenuItem; ::WinSendMsg( GetHmenu() @@ -372,73 +352,79 @@ bool wxMenu::DoInsertOrAppend( ); } #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 -bool wxMenu::DoAppend( - wxMenuItem* pItem -) +void wxMenu::EndRadioGroup() { - wxCHECK_MSG( pItem, FALSE, _T("NULL item in wxMenu::DoAppend") ); + // + // We're not inside a radio group any longer + // + m_nStartRadioGroup = -1; +} // end of wxMenu::EndRadioGroup + +wxMenuItem* wxMenu::DoAppend( wxMenuItem* pItem ) +{ + wxCHECK_MSG( pItem, NULL, wxT("NULL item in wxMenu::DoAppend") ); - bool bCheck = FALSE; + bool bCheck = false; if (pItem->GetKind() == wxITEM_RADIO) { int nCount = GetMenuItemCount(); - if (m_lStartRadioGroup == -1) + if (m_nStartRadioGroup == -1) { // // Start a new radio group // - m_lStartRadioGroup = lCount; + m_nStartRadioGroup = nCount; // // For now it has just one element // pItem->SetAsRadioGroupStart(); - pItem->SetRadioGroupEnd(m_startRadioGroup); + pItem->SetRadioGroupEnd(m_nStartRadioGroup); // // Ensure that we have a checked item in the radio group // - bCheck = TRUE; + bCheck = true; } else // extend the current radio group { // // We need to update its end item // - pItem->SetRadioGroupStart(m_lStartRadioGroup); - wxMenuItemList::Node *node = GetMenuItems().Item(m_startRadioGroup); + pItem->SetRadioGroupStart(m_nStartRadioGroup); + + wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_nStartRadioGroup); if (node) { - node->GetData()->SetRadioGroupEnd(count); + node->GetData()->SetRadioGroupEnd(nCount); } else { - wxFAIL_MSG( _T("where is the radio group start item?") ); + wxFAIL_MSG( wxT("where is the radio group start item?") ); } } } @@ -446,27 +432,34 @@ bool wxMenu::DoAppend( { EndRadioGroup(); } + if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem)) { - return FALSE; + return NULL; } if (bCheck) { - pItem->Check(TRUE); + // + // Check the item initially + // + pItem->Check(true); } - return TRUE; -} // end of wxMenu::DoInsert + 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( @@ -477,19 +470,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 // @@ -512,12 +505,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(); } // @@ -555,27 +548,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())) { - wxLogLastError("SetMenuTitle"); + wxLogLastError(wxT("SetMenuTitle")); } } } else { - if (rLabel.IsEmpty() ) + if (rLabel.empty() ) { ::WinSendMsg( GetHmenu() ,MM_REMOVEITEM @@ -590,7 +581,7 @@ void wxMenu::SetTitle( // if (!::WinSetWindowText(hMenu, rLabel.c_str())) { - wxLogLastError("SetMenuTitle"); + wxLogLastError(wxT("SetMenuTitle")); } } } @@ -600,10 +591,8 @@ void wxMenu::SetTitle( // event processing // --------------------------------------------------------------------------- -bool wxMenu::OS2Command( - WXUINT WXUNUSED(uParam) -, WXWORD vId -) +bool wxMenu::OS2Command( WXUINT WXUNUSED(uParam), + WXWORD vId ) { // // Ignore commands from the menu title @@ -614,12 +603,12 @@ bool wxMenu::OS2Command( SendEvent( vId ,(int)::WinSendMsg( GetHmenu() ,MM_QUERYITEMATTR - ,(MPARAM)vId + ,MPFROMSHORT(vId) ,(MPARAM)MIA_CHECKED ) ); } - return TRUE; + return true; } // end of wxMenu::OS2Command // --------------------------------------------------------------------------- @@ -630,8 +619,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 @@ -648,7 +637,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() ) { @@ -704,6 +693,7 @@ wxMenuBar::wxMenuBar( int nCount , wxMenu* vMenus[] , const wxString sTitles[] +, long WXUNUSED(lStyle) ) { Init(); @@ -719,6 +709,15 @@ wxMenuBar::wxMenuBar( wxMenuBar::~wxMenuBar() { + // + // We should free PM's resources only if PM doesn't do it for us + // which happens if we're attached to a frame + // + if (m_hMenu && !IsAttached()) + { + ::WinDestroyWindow((HMENU)m_hMenu); + m_hMenu = (WXHMENU)NULL; + } } // end of wxMenuBar::~wxMenuBar // --------------------------------------------------------------------------- @@ -734,8 +733,7 @@ void wxMenuBar::Refresh() WXHMENU wxMenuBar::Create() { - MENUITEM vItem; - HWND hFrame; + HWND hFrame; if (m_hMenu != 0 ) return m_hMenu; @@ -754,7 +752,7 @@ WXHMENU wxMenuBar::Create() // if ((m_hMenu = ::WinCreateWindow( hFrame ,WC_MENU - ,(PSZ)NULL + ,NULL ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE ,0L ,0L @@ -767,47 +765,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); + 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; } } @@ -838,14 +836,14 @@ 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)); Refresh(); } // end of wxMenuBar::EnableTop -void wxMenuBar::SetLabelTop( +void wxMenuBar::SetMenuLabel( size_t nPos , const wxString& rLabel ) @@ -864,7 +862,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 @@ -873,25 +871,25 @@ void wxMenuBar::SetLabelTop( ,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 @@ -904,26 +902,26 @@ wxMenu* wxMenuBar::Replace( ) { SHORT nId; - wxString Title = TextToLabel(rTitle); + wxString sTitle = wxPMTextToLabel(rTitle); wxMenu* pMenuOld = wxMenuBarBase::Replace( nPos ,pMenu - ,Title + ,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) - return FALSE; - m_titles[nPos] = Title; + return NULL; + m_titles[nPos] = sTitle; if (IsAttached()) { ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); - ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str()); + ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str()); #if wxUSE_ACCEL if (pMenuOld->HasAccels() || pMenu->HasAccels()) @@ -939,26 +937,25 @@ 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 Title = TextToLabel(rTitle); - if (!wxMenuBarBase::Insert( nPos - ,pMenu - ,Title - )) - return FALSE; + wxString sTitle = wxPMTextToLabel(rTitle); + + if (!wxMenuBarBase::Insert( nPos, pMenu, sTitle )) + return false; - m_titles.Insert( Title - ,nPos - ); + m_titles.Insert( sTitle, nPos ); if (IsAttached()) { - ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str()); + pMenu->m_vMenuData.iPosition = (SHORT)nPos; + ::WinSendMsg( (HWND)m_hMenu + ,MM_INSERTITEM + ,(MPARAM)&pMenu->m_vMenuData + ,(MPARAM)sTitle.wx_str() + ); #if wxUSE_ACCEL if (pMenu->HasAccels()) { @@ -968,28 +965,28 @@ bool wxMenuBar::Insert( #endif // wxUSE_ACCEL Refresh(); } - return TRUE; + + return true; } // end of wxMenuBar::Insert -bool wxMenuBar::Append( - wxMenu* pMenu -, const wxString& rTitle -) +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 Title = TextToLabel(rTitle); - if (!wxMenuBarBase::Append(pMenu, Title)) - return FALSE; + wxString sTitle = wxPMTextToLabel(rsTitle); - m_titles.Add(Title); + if (!wxMenuBarBase::Append(pMenu, sTitle)) + 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)Title.c_str()); + ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str()); #if wxUSE_ACCEL if (pMenu->HasAccels()) { @@ -1001,7 +998,7 @@ bool wxMenuBar::Append( #endif // wxUSE_ACCEL Refresh(); } - return TRUE; + return true; } // end of wxMenuBar::Append wxMenu* wxMenuBar::Remove( @@ -1014,15 +1011,23 @@ wxMenu* wxMenuBar::Remove( if (!pMenu) return NULL; - nId = SHORT1FROMMR(::WinSendMsg((HWND)GetHmenu(), MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0)); + nId = SHORT1FROMMR(::WinSendMsg( (HWND)GetHmenu() + ,MM_ITEMIDFROMPOSITION + ,MPFROMSHORT(nPos) + ,(MPARAM)0) + ); if (nId == MIT_ERROR) { - wxLogLastError("LogLastError"); + wxLogLastError(wxT("LogLastError")); return NULL; } if (IsAttached()) { - ::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); + ::WinSendMsg( (HWND)GetHmenu() + ,MM_REMOVEITEM + ,MPFROM2SHORT(nId, TRUE) + ,(MPARAM)0 + ); #if wxUSE_ACCEL if (pMenu->HasAccels()) @@ -1035,7 +1040,7 @@ wxMenu* wxMenuBar::Remove( #endif // wxUSE_ACCEL Refresh(); } - m_titles.Remove(nPos); + m_titles.RemoveAt(nPos); return pMenu; } // end of wxMenuBar::Remove @@ -1049,10 +1054,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) @@ -1060,9 +1065,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 @@ -1077,7 +1082,7 @@ void wxMenuBar::Attach( wxFrame* pFrame ) { - wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") ); + wxMenuBarBase::Attach(pFrame); #if wxUSE_ACCEL RebuildAccelTable(); @@ -1085,10 +1090,12 @@ 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"); + { + wxLogLastError(wxT("WinSetAccelTable")); + } #endif // wxUSE_ACCEL } // end of wxMenuBar::Attach @@ -1112,14 +1119,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 @@ -1133,13 +1140,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 @@ -1154,15 +1161,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 -