X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a17e237f4ada1196d7c0f0c23d4dface749c587a..8f2c3ee9a0fb0457f81f4d70ad0077bf092b8a6a:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 626d99902f..37d22056e1 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -5,8 +5,8 @@ // Modified by: Vadim Zeitlin // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "menu.h" #endif @@ -28,11 +28,14 @@ #pragma hdrstop #endif +#if wxUSE_MENUS + #ifndef WX_PRECOMP #include "wx/frame.h" #include "wx/menu.h" #include "wx/utils.h" #include "wx/intl.h" + #include "wx/log.h" #endif #if wxUSE_OWNER_DRAWN @@ -40,9 +43,21 @@ #endif #include "wx/msw/private.h" -#include "wx/msw/menu.h" -#include "wx/menuitem.h" -#include "wx/log.h" + +#ifdef __WXWINCE__ +#include +#include +#include +#include +#include +#include +#if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__) +#include +#endif + +#include "wx/msw/wince/missing.h" + +#endif // other standard headers #include @@ -58,149 +73,271 @@ extern wxMenu *wxCurrentPopupMenu; // ---------------------------------------------------------------------------- // the (popup) menu title has this special id -static const int idMenuTitle = -2; +static const int idMenuTitle = -3; // ---------------------------------------------------------------------------- -// macros +// private functions // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) - IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) +// make the given menu item default +static void SetDefaultMenuItem(HMENU hmenu, UINT id) +{ +#ifndef __WXWINCE__ + MENUITEMINFO mii; + wxZeroMemory(mii); + mii.cbSize = sizeof(MENUITEMINFO); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DEFAULT; + + if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#else + wxUnusedVar(hmenu); + wxUnusedVar(id); +#endif +} + +#ifdef __WXWINCE__ +UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) +{ + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_STATE; + // MF_BYCOMMAND is zero so test MF_BYPOSITION + if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) ) + wxLogLastError(wxT("GetMenuItemInfo")); + return info.fState; +} #endif // ============================================================================ // implementation // ============================================================================ +#include + +WX_DEFINE_LIST( wxMenuInfoList ) ; + +#if wxUSE_EXTENDED_RTTI + +WX_DEFINE_FLAGS( wxMenuStyle ) + +wxBEGIN_FLAGS( wxMenuStyle ) + wxFLAGS_MEMBER(wxMENU_TEAROFF) +wxEND_FLAGS( wxMenuStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler,"wx/menu.h") + +wxCOLLECTION_TYPE_INFO( wxMenuItem * , wxMenuItemList ) ; + +template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVariantArray &value) +{ + wxListCollectionToVariantArray( theList , value ) ; +} + +wxBEGIN_PROPERTIES_TABLE(wxMenu) + wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent) + wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxMenu) +wxEND_HANDLERS_TABLE() + +wxDIRECT_CONSTRUCTOR_2( wxMenu , wxString , Title , long , MenuStyle ) + +WX_DEFINE_FLAGS( wxMenuBarStyle ) + +wxBEGIN_FLAGS( wxMenuBarStyle ) + wxFLAGS_MEMBER(wxMB_DOCKABLE) +wxEND_FLAGS( wxMenuBarStyle ) + +// the negative id would lead the window (its superclass !) to vetoe streaming out otherwise +bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxWriter * , wxPersister * , wxxVariantArray & ) +{ + return true ; +} + +IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarStreamingCallback) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject , "wx/menu.h" ) + +wxBEGIN_PROPERTIES_TABLE(wxMenuInfo) + wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxREADONLY_PROPERTY( Title , wxString , GetTitle , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxMenuInfo) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title ) + +wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ; + +template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, wxxVariantArray &value) +{ + wxListCollectionToVariantArray( theList , value ) ; +} + +wxBEGIN_PROPERTIES_TABLE(wxMenuBar) + wxPROPERTY_COLLECTION( MenuInfos , wxMenuInfoList , wxMenuInfo* , Append , GetMenuInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxMenuBar) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_DUMMY( wxMenuBar ) + +#else +IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) +IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow) +IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject) +#endif + +const wxMenuInfoList& wxMenuBar::GetMenuInfos() const +{ + wxMenuInfoList* list = const_cast< wxMenuInfoList* >( &m_menuInfos ) ; + WX_CLEAR_LIST( wxMenuInfoList , *list ) ; + for( size_t i = 0 ; i < GetMenuCount() ; ++i ) + { + wxMenuInfo* info = new wxMenuInfo() ; + info->Create( const_cast(this)->GetMenu(i) , GetLabelTop(i) ) ; + list->Append( info ) ; + } + return m_menuInfos ; +} + // --------------------------------------------------------------------------- // wxMenu construction, adding and removing menu items // --------------------------------------------------------------------------- // Construct a menu with optional title (then use append) -void wxMenu::Init(const wxString& title, const wxFunction func ) +void wxMenu::Init() { - m_title = title; - m_parent = NULL; - m_eventHandler = this; - m_pInvokingWindow = NULL; - m_doBreak = FALSE ; - m_noItems = 0; - m_menuBar = NULL; - m_hMenu = (WXHMENU) CreatePopupMenu(); - m_savehMenu = 0 ; - m_topLevelMenu = this; - m_clientData = (void*) NULL; - - if ( !!m_title ) + m_doBreak = false; + m_startRadioGroup = -1; + + // create the menu + m_hMenu = (WXHMENU)CreatePopupMenu(); + if ( !m_hMenu ) { - Append(idMenuTitle, m_title) ; - AppendSeparator() ; + wxLogLastError(wxT("CreatePopupMenu")); } - Callback(func); + // if we have a title, insert it in the beginning of the menu + if ( !m_title.IsEmpty() ) + { + Append(idMenuTitle, m_title); + AppendSeparator(); + } } // The wxWindow destructor will take care of deleting the submenus. wxMenu::~wxMenu() { - // free Windows resources - if ( m_hMenu ) + // we should free Windows resources only if Windows doesn't do it for us + // which happens if we're attached to a menubar or a submenu of another + // menu + if ( !IsAttached() && !GetParent() ) { - ::DestroyMenu((HMENU)m_hMenu); - m_hMenu = 0; + if ( !::DestroyMenu(GetHmenu()) ) + { + wxLogLastError(wxT("DestroyMenu")); + } } - // delete submenus - wxNode *node = m_menuItems.First(); - while ( node ) - { - wxMenuItem *item = (wxMenuItem *)node->Data(); - - // Delete child menus. - // Beware: they must not be appended to children list!!! - // (because order of delete is significant) - if ( item->IsSubMenu() ) - item->DeleteSubMenu(); - - wxNode *next = node->Next(); - delete item; - delete node; - node = next; - } +#if wxUSE_ACCEL + // delete accels + WX_CLEAR_ARRAY(m_accels); +#endif // wxUSE_ACCEL } void wxMenu::Break() { - m_doBreak = TRUE; + // this will take effect during the next call to Append() + m_doBreak = true; } -// function appends a new item or submenu to the menu -void wxMenu::Append(wxMenuItem *pItem) +void wxMenu::Attach(wxMenuBarBase *menubar) { - wxCHECK_RET( pItem != NULL, wxT("can't append NULL item to the menu") ); + wxMenuBase::Attach(menubar); + + EndRadioGroup(); +} #if wxUSE_ACCEL - // check for accelerators: they are given after '\t' - wxString label = pItem->GetName(); - int posTab = label.Find(wxT('\t')); - if ( posTab != wxNOT_FOUND ) { - // parse the accelerator string - int keyCode = 0; - int accelFlags = wxACCEL_NORMAL; - wxString current; - for ( size_t n = (size_t)posTab + 1; n < label.Len(); n++ ) { - if ( (label[n] == '+') || (label[n] == '-') ) { - if ( current == _("ctrl") ) - accelFlags |= wxACCEL_CTRL; - else if ( current == _("alt") ) - accelFlags |= wxACCEL_ALT; - else if ( current == _("shift") ) - accelFlags |= wxACCEL_SHIFT; - else { - wxLogDebug(wxT("Unknown accel modifier: '%s'"), - current.c_str()); - } - - current.Empty(); - } - else { - current += wxTolower(label[n]); - } - } - if ( current.IsEmpty() ) { - wxLogDebug(wxT("No accel key found, accel string ignored.")); +int wxMenu::FindAccel(int id) const +{ + size_t n, count = m_accels.GetCount(); + for ( n = 0; n < count; n++ ) + { + if ( m_accels[n]->m_command == id ) + return n; + } + + return wxNOT_FOUND; +} + +void wxMenu::UpdateAccel(wxMenuItem *item) +{ + if ( item->IsSubMenu() ) + { + wxMenu *submenu = item->GetSubMenu(); + wxMenuItemList::compatibility_iterator node = submenu->GetMenuItems().GetFirst(); + while ( node ) + { + UpdateAccel(node->GetData()); + + node = node->GetNext(); } - else { - if ( current.Len() == 1 ) { - // it's a letter - keyCode = wxToupper(current[0U]); - } - else { - // it should be a function key - if ( current[0U] == 'f' && isdigit(current[1U]) && - (current.Len() == 2 || - (current.Len() == 3 && isdigit(current[2U]))) ) { - int n; - wxSscanf(current.c_str() + 1, wxT("%d"), &n); - - keyCode = VK_F1 + n - 1; - } - else { - wxLogDebug(wxT("Unrecognized accel key '%s', accel " - "string ignored."), current.c_str()); - } - } + } + else if ( !item->IsSeparator() ) + { + // 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 ) + { + // no old, add new if any + if ( accel ) + m_accels.Add(accel); + else + return; // skipping RebuildAccelTable() below + } + else + { + // 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.RemoveAt(n); } - if ( keyCode ) { - // do add an entry - m_accelKeyCodes.Add(keyCode); - m_accelFlags.Add(accelFlags); - m_accelIds.Add(pItem->GetId()); + if ( IsAttached() ) + { + GetMenuBar()->RebuildAccelTable(); } } + //else: it is a separator, they can't have accels, nothing to do +} + +#endif // wxUSE_ACCEL + +// append a new item or submenu to the menu +bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) +{ +#if wxUSE_ACCEL + UpdateAccel(pItem); #endif // wxUSE_ACCEL UINT flags = 0; @@ -209,7 +346,7 @@ void wxMenu::Append(wxMenuItem *pItem) // (and don't forget to reset the flag) if ( m_doBreak ) { flags |= MF_MENUBREAK; - m_doBreak = FALSE; + m_doBreak = false; } if ( pItem->IsSeparator() ) { @@ -221,13 +358,11 @@ void wxMenu::Append(wxMenuItem *pItem) UINT id; wxMenu *submenu = pItem->GetSubMenu(); if ( submenu != NULL ) { - wxASSERT( submenu->GetHMenu() != (WXHMENU) NULL ); + wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") ); + + submenu->SetParent(this); id = (UINT)submenu->GetHMenu(); - submenu->m_topLevelMenu = m_topLevelMenu; - submenu->m_parent = this; - submenu->m_savehMenu = (WXHMENU)id; - submenu->m_hMenu = 0; flags |= MF_POPUP; } @@ -235,6 +370,10 @@ void wxMenu::Append(wxMenuItem *pItem) id = pItem->GetId(); } +#ifdef __WXWINCE__ + wxString strippedString; +#endif + LPCTSTR pData; #if wxUSE_OWNER_DRAWN @@ -248,104 +387,171 @@ void wxMenu::Append(wxMenuItem *pItem) { // menu is just a normal string (passed in data parameter) flags |= MF_STRING; - pData = label; + +#ifdef __WXWINCE__ + strippedString = wxStripMenuCodes(pItem->GetText()); + pData = (wxChar*)strippedString.c_str(); +#else + pData = (wxChar*)pItem->GetText().c_str(); +#endif } - if ( !::AppendMenu(GetHmenu(), flags, id, pData) ) + BOOL ok; + if ( pos == (size_t)-1 ) { - wxLogLastError("AppendMenu"); + ok = ::AppendMenu(GetHmenu(), flags, id, pData); } else { -#ifdef __WIN32__ - if ( (int)id == idMenuTitle ) - { - // visually select the menu title - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = MFS_DEFAULT; + ok = ::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData); + } - if ( !SetMenuItemInfo(GetHmenu(), (unsigned)id, FALSE, &mii) ) - { - wxLogLastError(wxT("SetMenuItemInfo")); - } - } + if ( !ok ) + { + wxLogLastError(wxT("Insert or AppendMenu")); + + return false; + } + + // if we just appended the title, highlight it +#ifdef __WIN32__ + if ( (int)id == idMenuTitle ) + { + // visually select the menu title + SetDefaultMenuItem(GetHmenu(), id); + } #endif // __WIN32__ - m_menuItems.Append(pItem); - m_noItems++; + // if we're already attached to the menubar, we must update it + if ( IsAttached() && GetMenuBar()->IsAttached() ) + { + GetMenuBar()->Refresh(); } + + return true; } -void wxMenu::AppendSeparator() +void wxMenu::EndRadioGroup() { - Append(new wxMenuItem(this, ID_SEPARATOR)); + // we're not inside a radio group any longer + m_startRadioGroup = -1; } -// Pullright item -void wxMenu::Append(int id, - const wxString& label, - wxMenu *SubMenu, - const wxString& helpString) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) { - Append(new wxMenuItem(this, id, label, helpString, FALSE, SubMenu)); + wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") ); + + bool check = false; + + if ( item->GetKind() == wxITEM_RADIO ) + { + int count = GetMenuItemCount(); + + if ( m_startRadioGroup == -1 ) + { + // start a new radio group + m_startRadioGroup = count; + + // for now it has just one element + item->SetAsRadioGroupStart(); + item->SetRadioGroupEnd(m_startRadioGroup); + + // ensure that we have a checked item in the radio group + check = true; + } + else // extend the current radio group + { + // we need to update its end item + item->SetRadioGroupStart(m_startRadioGroup); + wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup); + + if ( node ) + { + node->GetData()->SetRadioGroupEnd(count); + } + else + { + wxFAIL_MSG( _T("where is the radio group start item?") ); + } + } + } + else // not a radio item + { + EndRadioGroup(); + } + + if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) ) + { + return NULL; + } + + if ( check ) + { + // check the item initially + item->Check(true); + } + + return item; } -// Ordinary menu item -void wxMenu::Append(int id, - const wxString& label, - const wxString& helpString, - bool checkable) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - // 'checkable' parameter is useless for Windows. - Append(new wxMenuItem(this, id, label, helpString, checkable)); + if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos)) + return item; + else + return NULL; } -// delete item by id -void wxMenu::Delete(int id) +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - wxMenuItem *item = NULL; - int pos; - wxNode *node; - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) + // we need to find the items position in the child list + size_t pos; + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + for ( pos = 0; node; pos++ ) { - item = (wxMenuItem *)node->Data(); - if ( item->GetId() == id ) + if ( node->GetData() == item ) break; + + node = node->GetNext(); } - wxCHECK_RET( node, wxT("wxMenu::Delete(): item doesn't exist") ); - - HMENU menu = GetHmenu(); - - wxMenu *pSubMenu = item->GetSubMenu(); - if ( pSubMenu != NULL ) { - RemoveMenu(menu, (UINT)pos, MF_BYPOSITION); - pSubMenu->m_hMenu = pSubMenu->m_savehMenu; - pSubMenu->m_savehMenu = 0; - pSubMenu->m_parent = NULL; - // RemoveChild(item->subMenu); - pSubMenu->m_topLevelMenu = NULL; - // TODO: Why isn't subMenu deleted here??? - // Will put this in for now. Assuming this is supposed - // to delete the menu, not just remove it. - item->DeleteSubMenu(); + // DoRemove() (unlike Remove) can only be called for existing item! + wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); + +#if wxUSE_ACCEL + // remove the corresponding accel from the accel table + int n = FindAccel(item->GetId()); + if ( n != wxNOT_FOUND ) + { + delete m_accels[n]; + + m_accels.RemoveAt(n); } - else { - DeleteMenu(menu, (UINT)pos, MF_BYPOSITION); + //else: this item doesn't have an accel, nothing to do +#endif // wxUSE_ACCEL + + // remove the item from the menu + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); } - m_menuItems.DeleteNode(node); - delete item; -} + if ( IsAttached() && GetMenuBar()->IsAttached() ) + { + // otherwise, the chane won't be visible + GetMenuBar()->Refresh(); + } -#if wxUSE_ACCEL + // and from internal data structures + return wxMenuBase::DoRemove(item); +} // --------------------------------------------------------------------------- // accelerator helpers // --------------------------------------------------------------------------- +#if wxUSE_ACCEL + // create the wxAcceleratorEntries for our accels and put them into provided // array - return the number of accels we have size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const @@ -353,7 +559,7 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const size_t count = GetAccelCount(); for ( size_t n = 0; n < count; n++ ) { - (*accels++).Set(m_accelFlags[n], m_accelKeyCodes[n], m_accelIds[n]); + *accels++ = *m_accels[n]; } return count; @@ -362,84 +568,7 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const #endif // wxUSE_ACCEL // --------------------------------------------------------------------------- -// wxMenu functions implemented in wxMenuItem -// --------------------------------------------------------------------------- - -void wxMenu::Enable(int id, bool Flag) -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_RET( item != NULL, wxT("can't enable non-existing menu item") ); - - item->Enable(Flag); -} - -bool wxMenu::IsEnabled(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_MSG( item != NULL, FALSE, wxT("invalid item id") ); - - return item->IsEnabled(); -} - -void wxMenu::Check(int id, bool Flag) -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_RET( item != NULL, wxT("can't get status of non-existing menu item") ); - - item->Check(Flag); -} - -bool wxMenu::IsChecked(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_MSG( item != NULL, FALSE, wxT("invalid item id") ); - - return item->IsChecked(); -} - -void wxMenu::SetLabel(int id, const wxString& label) -{ - wxMenuItem *item = FindItemForId(id) ; - wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") ); - - item->SetName(label); -} - -wxString wxMenu::GetLabel(int id) const -{ - wxString label; - wxMenuItem *pItem = FindItemForId(id) ; - if (pItem) - label = pItem->GetName() ; - else - wxFAIL_MSG(wxT("wxMenu::GetLabel: item doesn't exist")); - - return label; -} - -void wxMenu::SetHelpString(int itemId, const wxString& helpString) -{ - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); - else - wxFAIL_MSG(wxT("wxMenu::SetHelpString: item doesn't exist")); -} - -wxString wxMenu::GetHelpString (int itemId) const -{ - wxString help; - wxMenuItem *item = FindItemForId (itemId); - if (item) - help = item->GetHelp(); - else - wxFAIL_MSG(wxT("wxMenu::GetHelpString: item doesn't exist")); - - return help; -} - -// --------------------------------------------------------------------------- -// wxMenu title +// set wxMenu title // --------------------------------------------------------------------------- void wxMenu::SetTitle(const wxString& label) @@ -453,9 +582,9 @@ void wxMenu::SetTitle(const wxString& label) { if ( !label.IsEmpty() ) { - if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) || - !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) + if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) || + !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) { wxLogLastError(wxT("InsertMenu")); } @@ -469,18 +598,32 @@ void wxMenu::SetTitle(const wxString& label) if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) || !RemoveMenu(hMenu, 0, MF_BYPOSITION) ) { - wxLogLastError("RemoveMenu"); + wxLogLastError(wxT("RemoveMenu")); } } else { // modify the title +#ifdef __WXWINCE__ + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_TYPE; + info.fType = MFT_STRING; + info.cch = m_title.Length(); + info.dwTypeData = (LPTSTR) m_title.c_str(); + if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#else if ( !ModifyMenu(hMenu, 0u, - MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) ) + MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) ) { - wxLogLastError("ModifyMenu"); + wxLogLastError(wxT("ModifyMenu")); } +#endif } } @@ -488,22 +631,9 @@ void wxMenu::SetTitle(const wxString& label) // put the title string in bold face if ( !m_title.IsEmpty() ) { - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = MFS_DEFAULT; - - if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) ) - { - wxLogLastError("SetMenuItemInfo"); - } + SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle); } -#endif -} - -const wxString wxMenu::GetTitle() const -{ - return m_title; +#endif // Win32 } // --------------------------------------------------------------------------- @@ -513,124 +643,29 @@ const wxString wxMenu::GetTitle() const bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) { // ignore commands from the menu title - - // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!! if ( id != (WXWORD)idMenuTitle ) { - wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED); - event.SetEventObject( this ); - event.SetId( id ); - event.SetInt( id ); - ProcessCommand(event); - } - - return TRUE; -} - -bool wxMenu::ProcessCommand(wxCommandEvent & event) -{ - bool processed = FALSE; - - // Try a callback - if (m_callback) - { - (void)(*(m_callback))(*this, event); - processed = TRUE; - } - - // Try the menu's event handler - if ( !processed && GetEventHandler()) - { - processed = GetEventHandler()->ProcessEvent(event); - } - - // Try the window the menu was popped up from (and up through the - // hierarchy) - wxWindow *win = GetInvokingWindow(); - if ( !processed && win ) - processed = win->GetEventHandler()->ProcessEvent(event); - - return processed; -} - -// --------------------------------------------------------------------------- -// Item search -// --------------------------------------------------------------------------- - -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const -{ - wxString itemLabel = wxStripMenuCodes(itemString); - for ( wxNode *node = m_menuItems.First(); node; node = node->Next() ) - { - wxMenuItem *item = (wxMenuItem *)node->Data(); - if ( item->IsSubMenu() ) - { - int ans = item->GetSubMenu()->FindItem(itemString); - if ( ans != wxNOT_FOUND ) - return ans; - } - else if ( !item->IsSeparator() ) - { - wxString label = wxStripMenuCodes(item->GetName()); - if ( itemLabel == label ) - return item->GetId(); - } - } - - return wxNOT_FOUND; -} - -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const -{ - if ( itemMenu ) - *itemMenu = NULL; - - wxMenuItem *item = NULL; - for ( wxNode *node = m_menuItems.First(); node && !item; node = node->Next() ) - { - item = (wxMenuItem *)node->Data(); - - if ( item->GetId() == itemId ) - { - if (itemMenu) - *itemMenu = (wxMenu *)this; - } - else if ( item->IsSubMenu() ) - { - item = item->GetSubMenu()->FindItemForId(itemId, itemMenu); - } - else - { - // don't exit the loop - item = NULL; - } + // get the checked status of the command: notice that menuState is the + // old state of the menu, so the test for MF_CHECKED must be inversed + UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND); + SendEvent(id, !(menuState & MF_CHECKED)); } - return item; + return true; } // --------------------------------------------------------------------------- // other // --------------------------------------------------------------------------- -void wxMenu::Attach(wxMenuBar *menubar) -{ - // 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 = menubar; - m_savehMenu = m_hMenu; - m_hMenu = 0; -} - -void wxMenu::Detach() +wxWindow *wxMenu::GetWindow() const { - wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") ); + if ( m_invokingWindow != NULL ) + return m_invokingWindow; + else if ( GetMenuBar() != NULL) + return GetMenuBar()->GetFrame(); - m_hMenu = m_savehMenu; - m_savehMenu = 0; + return NULL; } // --------------------------------------------------------------------------- @@ -640,11 +675,17 @@ void wxMenu::Detach() void wxMenuBar::Init() { m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; m_hMenu = 0; +#if wxUSE_TOOLBAR && defined(__WXWINCE__) + m_toolBar = NULL; +#endif + // Not using a combined wxToolBar/wxMenuBar? then use + // a commandbar in WinCE .NET just to implement the + // menubar. +#if defined(WINCE_WITH_COMMANDBAR) + m_commandBar = NULL; + m_adornmentsAdded = false; +#endif } wxMenuBar::wxMenuBar() @@ -657,31 +698,46 @@ wxMenuBar::wxMenuBar( long WXUNUSED(style) ) Init(); } -wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) +wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { Init(); - m_menuCount = count; - m_menus = menus; - m_titles = new wxString[count]; + m_titles.Alloc(count); - int i; - for ( i = 0; i < count; i++ ) - m_titles[i] = titles[i]; + for ( size_t i = 0; i < count; i++ ) + { + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); - for ( i = 0; i < count; i++ ) - m_menus[i]->Attach(this); + menus[i]->Attach(this); + } } wxMenuBar::~wxMenuBar() { - for ( int i = 0; i < m_menuCount; i++ ) + // In Windows CE (not .NET), the menubar is always associated + // with a toolbar, which destroys the menu implicitly. +#if defined(WINCE_WITHOUT_COMMANDBAR) && defined(__POCKETPC__) + if (GetToolBar()) { - delete m_menus[i]; + wxToolMenuBar* toolMenuBar = wxDynamicCast(GetToolBar(), wxToolMenuBar); + if (toolMenuBar) + toolMenuBar->SetMenuBar(NULL); } - - delete[] m_menus; - delete[] m_titles; +#else + // we should free Windows resources only if Windows doesn't do it for us + // which happens if we're attached to a frame + if (m_hMenu && !IsAttached()) + { +#if defined(WINCE_WITH_COMMANDBAR) + ::DestroyWindow((HWND) m_commandBar); + m_commandBar = (WXHWND) NULL; +#else + ::DestroyMenu((HMENU)m_hMenu); +#endif + m_hMenu = (WXHMENU)NULL; + } +#endif } // --------------------------------------------------------------------------- @@ -690,152 +746,154 @@ wxMenuBar::~wxMenuBar() void wxMenuBar::Refresh() { - wxCHECK_RET( m_menuBarFrame, wxT("can't refresh a menubar withotu a frame") ); + wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); - DrawMenuBar((HWND)m_menuBarFrame->GetHWND()) ; +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (GetToolBar()) + { + CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); + } +#elif defined(WINCE_WITH_COMMANDBAR) + if (m_commandBar) + DrawMenuBar((HWND) m_commandBar); +#else + DrawMenuBar(GetHwndOf(GetFrame())); +#endif } WXHMENU wxMenuBar::Create() { - if (m_hMenu != 0 ) - return m_hMenu; + // Note: this totally doesn't work on Smartphone, + // since you have to use resources. + // We'll have to find another way to add a menu + // by changing/adding menu items to an existing menu. +#if defined(WINCE_WITHOUT_COMMANDBAR) + if ( m_hMenu != 0 ) + return m_hMenu; + + if (!GetToolBar()) + return 0; + + HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); + HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0); + if (hMenu) + { + TBBUTTON tbButton; + memset(&tbButton, 0, sizeof(TBBUTTON)); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE; + + size_t i; + for (i = 0; i < GetMenuCount(); i++) + { + HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu() ; + tbButton.dwData = (DWORD)hPopupMenu; + wxString label = wxStripMenuCodes(GetLabelTop(i)); + tbButton.iString = (int) label.c_str(); - wxCHECK_MSG( !m_hMenu, TRUE, wxT("menubar already created") ); + int position = i; + + tbButton.idCommand = NewControlId(); + if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton)) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + } + } + } + m_hMenu = (WXHMENU) hMenu; + return m_hMenu; +#else + if ( m_hMenu != 0 ) + return m_hMenu; m_hMenu = (WXHMENU)::CreateMenu(); if ( !m_hMenu ) { - wxLogLastError("CreateMenu"); + wxLogLastError(wxT("CreateMenu")); } else { - for ( int i = 0; i < m_menuCount; i++ ) + size_t count = GetMenuCount(), i; + wxMenuList::iterator it; + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) { if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, - (UINT)m_menus[i]->GetHMenu(), + (UINT)(*it)->GetHMenu(), m_titles[i]) ) { - wxLogLastError("AppendMenu"); + wxLogLastError(wxT("AppendMenu")); } } } return m_hMenu; +#endif } -// --------------------------------------------------------------------------- -// wxMenuBar functions forwarded to wxMenuItem -// --------------------------------------------------------------------------- - -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus to enable/disable items -void wxMenuBar::Enable(int id, bool enable) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, wxT("attempt to enable an item which doesn't exist") ); - - item->Enable(enable); -} - -void wxMenuBar::EnableTop(int pos, bool enable) -{ - int flag = enable ? MF_ENABLED : MF_GRAYED;; - - EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); -} - -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int id, bool check) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, wxT("attempt to check an item which doesn't exist") ); - wxCHECK_RET( item->IsCheckable(), wxT("attempt to check an uncheckable item") ); - - item->Check(check); -} - -bool wxMenuBar::IsChecked(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked(): no such item") ); - - int flag = ::GetMenuState(GetHmenuOf(itemMenu), id, MF_BYCOMMAND); - - return (flag & MF_CHECKED) != 0; -} - -bool wxMenuBar::IsEnabled(int id) const +int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled(): no such item") ); - - int flag = ::GetMenuState(GetHmenuOf(itemMenu), id, MF_BYCOMMAND) ; + wxASSERT(menu); + wxASSERT(menu->GetHMenu()); + wxASSERT(m_hMenu); + +#if defined(__WXWINCE__) + int totalMSWItems = GetMenuCount(); +#else + int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu); +#endif - // don't "and" with MF_ENABLED because its value is 0 - return (flag & MF_DISABLED) == 0; + int i; // For old C++ compatibility + for(i=wxpos; iGetHMenu()) + return i; + } + for(i=0; iGetHMenu()) + return i; + } + wxFAIL; + return -1; } -void wxMenuBar::SetLabel(int id, const wxString& label) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, wxT("wxMenuBar::SetLabel(): no such item") ); +// --------------------------------------------------------------------------- +// wxMenuBar functions to work with the top level submenus +// --------------------------------------------------------------------------- - item->SetName(label); -} +// NB: we don't support owner drawn top level items for now, if we do these +// functions would have to be changed to use wxMenuItem as well -wxString wxMenuBar::GetLabel(int id) const +void wxMenuBar::EnableTop(size_t pos, bool enable) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; + wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); - wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel(): no such item") ); + int flag = enable ? MF_ENABLED : MF_GRAYED; - return item->GetName(); -} - -void wxMenuBar::SetHelpString (int id, const wxString& helpString) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString(): no such item") ); + EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag); - item->SetHelp(helpString); + Refresh(); } -wxString wxMenuBar::GetHelpString (int id) const +void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString(): no such item") ); + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); - return item->GetHelp(); -} + m_titles[pos] = label; -// --------------------------------------------------------------------------- -// wxMenuBar functions to work with the top level submenus -// --------------------------------------------------------------------------- + if ( !IsAttached() ) + { + return; + } + //else: have to modify the existing menu -// NB: we don't support owner drawn top level items for now, if we do these -// functions would have to be changed to use wxMenuItem as well + int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos); -void wxMenuBar::SetLabelTop(int pos, const wxString& label) -{ UINT id; - UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION); + UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION); if ( flagsOld == 0xFFFFFFFF ) { wxLogLastError(wxT("GetMenuState")); @@ -846,232 +904,253 @@ void wxMenuBar::SetLabelTop(int pos, const wxString& label) if ( flagsOld & MF_POPUP ) { // HIBYTE contains the number of items in the submenu in this case - flagsOld &= 0xff ; - id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos) ; + flagsOld &= 0xff; + id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos); } else { id = pos; } - if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld, - id, label) == (int)0xFFFFFFFF ) +#ifdef __WXWINCE__ + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_TYPE; + info.fType = MFT_STRING; + info.cch = label.Length(); + info.dwTypeData = (LPTSTR) label.c_str(); + if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } + +#else + if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld, + id, label) == (int)0xFFFFFFFF ) { - wxLogLastError("ModifyMenu"); + wxLogLastError(wxT("ModifyMenu")); } +#endif + + Refresh(); } -wxString wxMenuBar::GetLabelTop(int pos) const +wxString wxMenuBar::GetLabelTop(size_t pos) const { - int len = ::GetMenuString((HMENU)m_hMenu, pos, NULL, 0, MF_BYCOMMAND); + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetLabelTop") ); - len++; // for the NUL character - wxString label; - ::GetMenuString(GetHmenu(), pos, label.GetWriteBuf(len), len, MF_BYCOMMAND); - label.UngetWriteBuf(); - - return label; + return wxMenuItem::GetLabelFromText(m_titles[pos]); } // --------------------------------------------------------------------------- -// wxMenuBar notifications +// wxMenuBar construction // --------------------------------------------------------------------------- -bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - if ( !m_menuBarFrame ) - return TRUE; - - if ( ::RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION) ) - { - // VZ: I'm not sure about what's going on here, so I leave an assert - wxASSERT_MSG( m_menus[pos] == a_menu, wxT("what is this parameter for??") ); + wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); + if ( !menuOld ) + return NULL; - a_menu->Detach(); + m_titles[pos] = title; - if ( m_menuBarFrame ) - Refresh(); - - return TRUE; - } - else + if ( IsAttached() ) { - wxLogLastError("RemoveMenu"); - } + int mswpos = MSWPositionForWxMenu(menuOld,pos); - return FALSE; -} - -bool wxMenuBar::OnAppend(wxMenu *a_menu, const wxChar *title) -{ - WXHMENU submenu = a_menu->GetHMenu(); - if ( !submenu ) - return FALSE; + // can't use ModifyMenu() because it deletes the submenu it replaces + if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } - if ( !m_menuBarFrame ) - return TRUE; + if ( !::InsertMenu(GetHmenu(), (UINT)mswpos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)GetHmenuOf(menu), title) ) + { + wxLogLastError(wxT("InsertMenu")); + } - a_menu->Attach(this); +#if wxUSE_ACCEL + if ( menuOld->HasAccels() || menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, - (UINT)submenu, title) ) - { - wxLogLastError(wxT("AppendMenu")); + Refresh(); } - Refresh(); - - return TRUE; + return menuOld; } -// --------------------------------------------------------------------------- -// wxMenuBar construction -// --------------------------------------------------------------------------- -int wxMenuBar::FindMenu(const wxString& title) +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - wxString menuTitle = wxStripMenuCodes(title); - for ( int i = 0; i < m_menuCount; i++ ) - { - wxString title = wxStripMenuCodes(m_titles[i]); - if ( menuTitle == title ) - return i; - } - - return wxNOT_FOUND; - -} + // Find out which MSW item before which we'll be inserting before + // wxMenuBarBase::Insert is called and GetMenu(pos) is the new menu. + // If IsAttached() is false this won't be used anyway + int mswpos = (!IsAttached() || (pos == m_menus.GetCount())) + ? -1 // append the menu + : MSWPositionForWxMenu(GetMenu(pos),pos); + if ( !wxMenuBarBase::Insert(pos, menu, title) ) + return false; -void wxMenuBar::ReplaceMenu(int pos, wxMenu * new_menu, const wxString& title) -{ - if (m_menuBarFrame) return; + m_titles.Insert(title, pos); - if ( pos >= 0 && pos < m_menuCount ) + if ( IsAttached() ) { - wxMenu *old_menu = m_menus[pos]; - m_menus[pos] = new_menu; - delete old_menu; +#if defined(WINCE_WITHOUT_COMMANDAR) + if (!GetToolBar()) + return false; + TBBUTTON tbButton; + memset(&tbButton, 0, sizeof(TBBUTTON)); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE; + + HMENU hPopupMenu = (HMENU) menu->GetHMenu() ; + tbButton.dwData = (DWORD)hPopupMenu; + wxString label = wxStripMenuCodes(title); + tbButton.iString = (int) label.c_str(); + + tbButton.idCommand = NewControlId(); + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton)) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + return false; + } +#else + if ( !::InsertMenu(GetHmenu(), mswpos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)GetHmenuOf(menu), title) ) + { + wxLogLastError(wxT("InsertMenu")); + } +#endif +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + Refresh(); } + return true; } - -void wxMenuBar::Insert(int pos, wxMenu * menu, const wxString& title) +bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { - if (m_menuBarFrame) return; - if ( pos < 0 && pos >= m_menuCount ) return; + WXHMENU submenu = menu ? menu->GetHMenu() : 0; + wxCHECK_MSG( submenu, false, wxT("can't append invalid menu to menubar") ); + + if ( !wxMenuBarBase::Append(menu, title) ) + return false; - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; + m_titles.Add(title); - for (i = 0; i < pos; i++) + if ( IsAttached() ) { - new_menus[i] = m_menus[i]; - m_menus[i] = NULL; - new_titles[i] = m_titles[i]; - m_titles[i] = wxT(""); - } +#if defined(WINCE_WITHOUT_COMMANDAR) + if (!GetToolBar()) + return false; + TBBUTTON tbButton; + memset(&tbButton, 0, sizeof(TBBUTTON)); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE; + + size_t pos = GetMenuCount(); + HMENU hPopupMenu = (HMENU) menu->GetHMenu() ; + tbButton.dwData = (DWORD)hPopupMenu; + wxString label = wxStripMenuCodes(title); + tbButton.iString = (int) label.c_str(); + + tbButton.idCommand = NewControlId(); + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton)) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + return false; + } +#else + if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, + (UINT)submenu, title) ) + { + wxLogLastError(wxT("AppendMenu")); + } +#endif - new_menus[pos] = (wxMenu *)menu; - new_titles[i] = title; +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accelerator table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - for (i = pos+1; i < m_menuCount; i++) - { - new_menus[i] = m_menus[i-1]; - m_menus[i-1] = NULL; - new_titles[i] = m_titles[i-1]; - m_titles[i-1] = wxT(""); - } - if (m_menus) - { - delete[]m_menus; - delete[]m_titles; + Refresh(); } - m_menus = new_menus; - m_titles = new_titles; - - menu->SetParent(this); + return true; } - -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +wxMenu *wxMenuBar::Remove(size_t pos) { - if (!OnAppend(menu, title)) - return; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; - - for (i = 0; i < m_menuCount - 1; i++) - { - new_menus[i] = m_menus[i]; - m_menus[i] = NULL; - new_titles[i] = m_titles[i]; - m_titles[i] = wxT(""); - } - if (m_menus) + if ( IsAttached() ) { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; - - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; - - menu->SetParent(this); -} - -void wxMenuBar::Delete(wxMenu * menu, int i) -{ - int j; - int ii = (int) i; +#if defined(WINCE_WITHOUT_COMMANDAR) + if (GetToolBar()) + { + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) + { + wxLogLastError(wxT("TB_DELETEBUTTON")); + } + } +#else + if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } +#endif - if (menu != 0) { - for (ii = 0; ii < m_menuCount; ii++) { - if (m_menus[ii] == menu) - break; +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); } - if (ii >= m_menuCount) - return; - } else { - if (ii < 0 || ii >= m_menuCount) - return; - menu = m_menus[ii]; +#endif // wxUSE_ACCEL + + Refresh(); } - if (!OnDelete(menu, ii)) - return; - menu->SetParent(NULL); + m_titles.RemoveAt(pos); - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; - } + return menu; } -void wxMenuBar::Attach(wxFrame *frame) -{ - wxASSERT_MSG( !m_menuBarFrame, wxT("menubar already attached!") ); - - m_menuBarFrame = frame; - #if wxUSE_ACCEL - // create the accel table - we consider that the menubar construction is - // finished + +void wxMenuBar::RebuildAccelTable() +{ + // merge the accelerators of all menus into one accel table size_t nAccelCount = 0; - int i; - for ( i = 0; i < m_menuCount; i++ ) + size_t i, count = GetMenuCount(); + wxMenuList::iterator it; + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) { - nAccelCount += m_menus[i]->GetAccelCount(); + nAccelCount += (*it)->GetAccelCount(); } if ( nAccelCount ) @@ -1079,121 +1158,65 @@ void wxMenuBar::Attach(wxFrame *frame) wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount]; nAccelCount = 0; - for ( i = 0; i < m_menuCount; i++ ) + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) { - nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]); + nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]); } m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries); delete [] accelEntries; } -#endif // wxUSE_ACCEL -} - -void wxMenuBar::Detach() -{ -// ::DestroyMenu((HMENU)m_hMenu); - m_hMenu = (WXHMENU)NULL; - m_menuBarFrame = NULL; } +#endif // wxUSE_ACCEL -// --------------------------------------------------------------------------- -// wxMenuBar searching for menu items -// --------------------------------------------------------------------------- - -// Find the itemString in menuString, and return the item id or wxNOT_FOUND -int wxMenuBar::FindMenuItem(const wxString& menuString, - const wxString& itemString) const +void wxMenuBar::Attach(wxFrame *frame) { - wxString menuLabel = wxStripMenuCodes(menuString); - for ( int i = 0; i < m_menuCount; i++ ) + wxMenuBarBase::Attach(frame); + +#if defined(WINCE_WITH_COMMANDBAR) + if (!m_hMenu) + this->Create(); + if (!m_commandBar) + m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId()); + if (m_commandBar) { - wxString title = wxStripMenuCodes(m_titles[i]); - if ( menuString == title ) - return m_menus[i]->FindItem(itemString); + if (m_hMenu) + { + if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0)) + { + wxLogLastError(wxT("CommandBar_InsertMenubarEx")); + } + } } +#endif - return wxNOT_FOUND; +#if wxUSE_ACCEL + RebuildAccelTable(); +#endif // wxUSE_ACCEL } -wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu **itemMenu) const +#if defined(WINCE_WITH_COMMANDBAR) +bool wxMenuBar::AddAdornments(long style) { - if ( itemMenu ) - *itemMenu = NULL; + if (m_adornmentsAdded || !m_commandBar) + return false; - wxMenuItem *item = NULL; - for ( int i = 0; !item && (i < m_menuCount); i++ ) + if (style & wxCLOSE_BOX) { - item = m_menus[i]->FindItemForId(id, itemMenu); + if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0)) + wxLogLastError(wxT("CommandBar_AddAdornments")); + else + return true; } - - return item; -} - - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -wxWindow *wxMenu::GetWindow() const -{ - if ( m_pInvokingWindow != NULL ) - return m_pInvokingWindow; - else if ( m_menuBar != NULL) - return m_menuBar->GetFrame(); - - return NULL; + return false; } +#endif -WXHMENU wxMenu::GetHMenu() const +void wxMenuBar::Detach() { - if ( m_hMenu != 0 ) - return m_hMenu; - else if ( m_savehMenu != 0 ) - return m_savehMenu; - - wxFAIL_MSG(wxT("wxMenu without HMENU")); - - return 0; + wxMenuBarBase::Detach(); } -// Update a menu and all submenus recursively. source is the object that has -// the update event handlers defined for it. If NULL, the menu or associated -// window will be used. -void wxMenu::UpdateUI(wxEvtHandler* source) -{ - if (!source && GetInvokingWindow()) - source = GetInvokingWindow()->GetEventHandler(); - if (!source) - source = GetEventHandler(); - if (!source) - source = this; - - wxNode* node = GetItems().First(); - while (node) - { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) - { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( source ); - - if (source->ProcessEvent(event)) - { - if (event.GetSetText()) - SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(id, event.GetEnabled()); - } - - if (item->GetSubMenu()) - item->GetSubMenu()->UpdateUI(source); - } - node = node->Next(); - } -} +#endif // wxUSE_MENUS