X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c626a8b797d2819e1e14110d77c04a530fd3b6b4..785f5eaa05195f5e44a974861864324667a3326e:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 345e930578..25ea2adc19 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -5,11 +5,19 @@ // 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +// =========================================================================== +// declarations +// =========================================================================== + +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "menu.h" #endif @@ -20,10 +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 @@ -31,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 +#include +#endif + +#include "wx/msw/wince/missing.h" + +#endif // other standard headers #include @@ -49,115 +73,273 @@ 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")); + } #endif +} -// convenience macro -#define GetHMENU() ((HMENU)GetHMenu()) +#ifdef __WXWINCE__ +UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) +{ + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_STATE; + if ( !GetMenuItemInfo(hMenu, id, flags & MF_BYCOMMAND ? FALSE : TRUE, & info) ) + wxLogLastError(wxT("GetMenuItemInfo")); + return info.fState; +} +#endif // ============================================================================ // implementation // ============================================================================ -// Menus +#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 , , 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 , , 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) -wxMenu::wxMenu(const wxString& title, const wxFunction func) - : m_title(title) +void wxMenu::Init() { - 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; + m_doBreak = FALSE; + m_startRadioGroup = -1; - if ( !!m_title ) + // 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 ) + { + Append(idMenuTitle, m_title); + AppendSeparator(); + } } // The wxWindow destructor will take care of deleting the submenus. wxMenu::~wxMenu() { - if (m_hMenu) - DestroyMenu((HMENU) m_hMenu); - m_hMenu = 0; + // 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() ) + { + if ( !::DestroyMenu(GetHmenu()) ) + { + wxLogLastError(wxT("DestroyMenu")); + } + } - // Windows seems really bad on Menu de-allocation... - // After many try, here is what I do: RemoveMenu() will ensure - // that popup are "disconnected" from their parent; then call - // delete method on each child (which in turn do a recursive job), - // and finally, DestroyMenu() - // - // With that, BoundCheckers is happy, and no complaints... - /* - int N = 0 ; - if (m_hMenu) - N = GetMenuItemCount(m_hMenu); - int i; - for (i = N-1; i >= 0; i--) - RemoveMenu(m_hMenu, i, MF_BYPOSITION); - */ - - // How is deleting submenus in this loop any different from deleting - // the submenus in the children list, via ~wxWindow ? - // I'll reinstate this deletion for now and remove addition - // from children list (which doesn't exist now) - // Julian 1/3/97 - 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->GetSubMenu()) - item->DeleteSubMenu(); - - wxNode *next = node->Next(); - delete item; - delete node; - node = next; - } - /* - if (m_hMenu) - DestroyMenu(m_hMenu); - m_hMenu = 0; - */ +#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, "can't append NULL item to the menu" ); + wxMenuBase::Attach(menubar); - m_menuItems.Append(pItem); + EndRadioGroup(); +} + +#if wxUSE_ACCEL + +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 ( !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 ( IsAttached() ) + { + m_menuBar->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; + // if "Break" has just been called, insert a menu break before this item + // (and don't forget to reset the flag) if ( m_doBreak ) { flags |= MF_MENUBREAK; m_doBreak = FALSE; @@ -167,18 +349,16 @@ void wxMenu::Append(wxMenuItem *pItem) flags |= MF_SEPARATOR; } - // id is the numeric id for normal menu items and HMENU for submenus + // id is the numeric id for normal menu items and HMENU for submenus as + // required by ::AppendMenu() API UINT id; - wxMenu *SubMenu = pItem->GetSubMenu(); - if ( SubMenu != NULL ) { - wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL ); + wxMenu *submenu = pItem->GetSubMenu(); + if ( submenu != NULL ) { + wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") ); - id = (UINT)SubMenu->m_hMenu; + submenu->SetParent(this); - SubMenu->m_topLevelMenu = m_topLevelMenu; - SubMenu->m_parent = this; - SubMenu->m_savehMenu = (WXHMENU)id; - SubMenu->m_hMenu = 0; + id = (UINT)submenu->GetHMenu(); flags |= MF_POPUP; } @@ -186,141 +366,223 @@ void wxMenu::Append(wxMenuItem *pItem) id = pItem->GetId(); } - LPCSTR pData; +#ifdef __WXWINCE__ + wxString strippedString; +#endif + + LPCTSTR pData; #if wxUSE_OWNER_DRAWN if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages? // item draws itself, pass pointer to it in data parameter flags |= MF_OWNERDRAW; - pData = (LPCSTR)pItem; + pData = (LPCTSTR)pItem; } else #endif { // menu is just a normal string (passed in data parameter) flags |= MF_STRING; - pData = pItem->GetName(); + +#ifdef __WXWINCE__ + strippedString = wxStripMenuCodes(pItem->GetText()); + pData = (wxChar*)strippedString.c_str(); +#else + pData = (wxChar*)pItem->GetText().c_str(); +#endif + } + + BOOL ok; + if ( pos == (size_t)-1 ) + { + ok = ::AppendMenu(GetHmenu(), flags, id, pData); + } + else + { + ok = ::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData); } - // visually select the menu title - if ( id == idMenuTitle ) + if ( !ok ) { - // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face + wxLogLastError(wxT("Insert or AppendMenu")); + + return FALSE; } - if ( !AppendMenu(GetHMENU(), flags, id, pData) ) + // if we just appended the title, highlight it +#ifdef __WIN32__ + if ( (int)id == idMenuTitle ) { - wxLogLastError("AppendMenu"); + // visually select the menu title + SetDefaultMenuItem(GetHmenu(), id); } +#endif // __WIN32__ - m_noItems++; + // if we're already attached to the menubar, we must update it + if ( IsAttached() && m_menuBar->IsAttached() ) + { + m_menuBar->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; } -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, "wxMenu::Delete(): item doesn't exist" ); + // DoRemove() (unlike Remove) can only be called for existing item! + wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); - HMENU menu = GetHMENU(); +#if wxUSE_ACCEL + // remove the corresponding accel from the accel table + int n = FindAccel(item->GetId()); + if ( n != wxNOT_FOUND ) + { + delete m_accels[n]; - 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(); - } - else { - DeleteMenu(menu, (UINT)pos, MF_BYPOSITION); + m_accels.RemoveAt(n); } + //else: this item doesn't have an accel, nothing to do +#endif // wxUSE_ACCEL - m_menuItems.DeleteNode(node); - delete item; -} + // remove the item from the menu + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } -void wxMenu::Enable(int Id, bool Flag) -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); + if ( IsAttached() && m_menuBar->IsAttached() ) + { + // otherwise, the chane won't be visible + m_menuBar->Refresh(); + } - item->Enable(Flag); + // and from internal data structures + return wxMenuBase::DoRemove(item); } -bool wxMenu::IsEnabled(int Id) const -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE, "invalid item id" ); +// --------------------------------------------------------------------------- +// accelerator helpers +// --------------------------------------------------------------------------- - return item->IsEnabled(); -} +#if wxUSE_ACCEL -void wxMenu::Check(int Id, bool Flag) +// 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 { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); + size_t count = GetAccelCount(); + for ( size_t n = 0; n < count; n++ ) + { + *accels++ = *m_accels[n]; + } - item->Check(Flag); + return count; } -bool wxMenu::IsChecked(int Id) const -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE, "invalid item id" ); +#endif // wxUSE_ACCEL - return item->IsChecked(); -} +// --------------------------------------------------------------------------- +// set wxMenu title +// --------------------------------------------------------------------------- void wxMenu::SetTitle(const wxString& label) { bool hasNoTitle = m_title.IsEmpty(); m_title = label; - HMENU hMenu = GetHMENU(); + HMENU hMenu = GetHmenu(); if ( hasNoTitle ) { 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("InsertMenu"); + wxLogLastError(wxT("InsertMenu")); } } } @@ -332,88 +594,47 @@ 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 } } -#ifndef __WIN16__ +#ifdef __WIN32__ // 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 } -void wxMenu::SetLabel(int Id, const wxString& label) -{ - wxMenuItem *item = FindItemForId(Id) ; - if (item==NULL) - return; - - if (item->GetSubMenu()==NULL) - { - HMENU hMenu = GetHMENU(); - - UINT was_flag = GetMenuState(hMenu, Id, MF_BYCOMMAND); - ModifyMenu(hMenu, Id, MF_BYCOMMAND | MF_STRING | was_flag, Id, label); - } - else - { - wxMenu *father = item->GetSubMenu()->m_topLevelMenu ; - wxNode *node = father->m_menuItems.First() ; - int i = 0 ; - while (node) - { - wxMenuItem *matched = (wxMenuItem*)node->Data() ; - if (matched==item) - break ; - i++ ; - node = node->Next() ; - } - // Here, we have the position. - ModifyMenu((HMENU)father->m_savehMenu,i, - MF_BYPOSITION|MF_STRING|MF_POPUP, - (UINT)item->GetSubMenu()->m_savehMenu,(const char *)label) ; - } - item->SetName(label); -} - -wxString wxMenu::GetLabel(int id) const -{ - wxString label; - wxMenuItem *pItem = FindItemForId(id) ; - if (pItem) - label = pItem->GetName() ; - else - wxFAIL_MSG("wxMenu::GetLabel: item doesn't exist"); - - return label; -} +// --------------------------------------------------------------------------- +// event processing +// --------------------------------------------------------------------------- bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) { @@ -422,546 +643,571 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) // 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); + // VZ: previosuly, the command int was set to id too which was quite + // useless anyhow (as it could be retrieved using GetId()) and + // uncompatible with wxGTK, so now we use the command int instead + // to pass the checked status + UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND) ; + SendEvent(id, menuState & MF_CHECKED); } return TRUE; } -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const -{ - // FIXME fixed size buffer - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); - - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - if (item->GetSubMenu()) - { - int ans = item->GetSubMenu()->FindItem(itemString); - if (ans > -1) - return ans; - } - if ( !item->IsSeparator() ) - { - wxStripMenuCodes((char *)item->GetName().c_str(), buf2); - if (strcmp(buf1, buf2) == 0) - return item->GetId(); - } - } - - return wxNOT_FOUND; -} +// --------------------------------------------------------------------------- +// other +// --------------------------------------------------------------------------- -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const +wxWindow *wxMenu::GetWindow() const { - if (itemMenu) - *itemMenu = NULL; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - - if (item->GetId() == itemId) - { - if (itemMenu) - *itemMenu = (wxMenu *) this; - return item; - } - - if (item->GetSubMenu()) - { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; - } - } + if ( m_invokingWindow != NULL ) + return m_invokingWindow; + else if ( m_menuBar != NULL) + return m_menuBar->GetFrame(); - if (itemMenu) - *itemMenu = NULL; return NULL; } -void wxMenu::SetHelpString(int itemId, const wxString& helpString) +// --------------------------------------------------------------------------- +// Menu Bar +// --------------------------------------------------------------------------- + +void wxMenuBar::Init() { - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); - else - wxFAIL_MSG("wxMenu::SetHelpString: item doesn't exist"); + m_eventHandler = this; + m_hMenu = 0; +#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) + m_toolBar = NULL; +#endif + // Not using a combined wxToolBar/wxMenuBar? then use + // a commandbar in WinCE .NET just to implement the + // menubar. +#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) + m_commandBar = NULL; +#endif } -wxString wxMenu::GetHelpString (int itemId) const +wxMenuBar::wxMenuBar() { - wxString help; - wxMenuItem *item = FindItemForId (itemId); - if (item) - help = item->GetHelp(); - else - wxFAIL_MSG("wxMenu::GetHelpString: item doesn't exist"); - - return help; + Init(); } -void wxMenu::ProcessCommand(wxCommandEvent & event) +wxMenuBar::wxMenuBar( long WXUNUSED(style) ) { - 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); + Init(); } -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) +wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) { - menu->SetInvokingWindow(this); - menu->UpdateUI(); + Init(); - HWND hWnd = (HWND) GetHWND(); - HMENU hMenu = (HMENU)menu->m_hMenu; - POINT point; - point.x = x; - point.y = y; - ::ClientToScreen(hWnd, &point); - wxCurrentPopupMenu = menu; - ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL); - wxYield(); - wxCurrentPopupMenu = NULL; + m_titles.Alloc(count); - menu->SetInvokingWindow(NULL); + for ( int i = 0; i < count; i++ ) + { + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); - return TRUE; + menus[i]->Attach(this); + } } -// Menu Bar -wxMenuBar::wxMenuBar() +wxMenuBar::~wxMenuBar() { - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; - m_hMenu = 0; + // In Windows CE (not .NET), the menubar is always associated + // with a toolbar, which destroys the menu implicitly. +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) + if (GetToolBar()) + GetToolBar()->SetMenuBar(NULL); +#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(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) + ::DestroyWindow((HWND) m_commandBar); + m_commandBar = (WXHWND) NULL; +#else + ::DestroyMenu((HMENU)m_hMenu); +#endif + m_hMenu = (WXHMENU)NULL; + } +#endif } -wxMenuBar::wxMenuBar( long WXUNUSED(style) ) -{ - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; - m_hMenu = 0; -} +// --------------------------------------------------------------------------- +// wxMenuBar helpers +// --------------------------------------------------------------------------- -wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[]) +void wxMenuBar::Refresh() { - m_eventHandler = this; - m_menuCount = N; - m_menus = Menus; - m_titles = new wxString[N]; - int i; - for ( i = 0; i < N; i++ ) - m_titles[i] = Titles[i]; - m_menuBarFrame = NULL; - for (i = 0; i < N; i++) - m_menus[i]->m_menuBar = (wxMenuBar *) this; + wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); - m_hMenu = 0; +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) + if (GetToolBar()) + { + CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); + } +#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) + if (m_commandBar) + DrawMenuBar((HWND) m_commandBar); +#else + DrawMenuBar(GetHwndOf(GetFrame())); +#endif } -wxMenuBar::~wxMenuBar() +WXHMENU wxMenuBar::Create() { - // In fact, don't want menu to be destroyed before MDI - // shuffling has taken place. Let it be destroyed - // automatically when the window is destroyed. + // 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(__WXWINCE__) && _WIN32_WCE < 400 + if ( m_hMenu != 0 ) + return m_hMenu; + + if (!GetToolBar()) + return 0; - // DestroyMenu(menu); - // m_hMenu = NULL; + 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(); + + 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; - int i; - /* - // See remarks in ::~wxMenu() method - // BEWARE - this may interfere with MDI fixes, so - // may need to remove - int N = 0 ; + m_hMenu = (WXHMENU)::CreateMenu(); - if (m_menuBarFrame && ((m_menuBarFrame->GetWindowStyleFlag() & wxSDI) == wxSDI)) + if ( !m_hMenu ) { - if (menu) - N = GetMenuItemCount(menu) ; - for (i = N-1; i >= 0; i--) - RemoveMenu(menu, i, MF_BYPOSITION); + wxLogLastError(wxT("CreateMenu")); } - */ - for (i = 0; i < m_menuCount; i++) + else { - delete m_menus[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)(*it)->GetHMenu(), + m_titles[i]) ) + { + wxLogLastError(wxT("AppendMenu")); + } + } } - delete[] m_menus; - delete[] m_titles; - /* Don't destroy menu here, in case we're MDI and - need to do some shuffling with VALID menu handles. - if (menu) - DestroyMenu(menu); - m_hMenu = 0; - */ + return m_hMenu; +#endif } -// 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) +int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos) { - int flag = enable ? MF_ENABLED : MF_GRAYED; - - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - - wxCHECK_RET( item, "attempt to enable an item which doesn't exist" ); + wxASSERT(menu); + wxASSERT(menu->GetHMenu()); + wxASSERT(m_hMenu); + +#if defined(__WXWINCE__) + int totalMSWItems = GetMenuCount(); +#else + int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu); +#endif - EnableMenuItem(GetHMENU(), Id, MF_BYCOMMAND | flag); + int i; // For old C++ compatibility + for(i=wxpos; iGetHMenu()) + return i; + } + for(i=0; iGetHMenu()) + return i; + } + wxFAIL; + return -1; } -void wxMenuBar::EnableTop(int pos, bool enable) -{ - int flag = enable ? MF_ENABLED : MF_GRAYED;; +// --------------------------------------------------------------------------- +// wxMenuBar functions to work with the top level submenus +// --------------------------------------------------------------------------- - EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; -} +// 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 -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int Id, bool check) +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") ); + + int flag = enable ? MF_ENABLED : MF_GRAYED; - wxCHECK_RET( item, "attempt to check an item which doesn't exist" ); - wxCHECK_RET( item->IsCheckable(), "attempt to check an uncheckable item" ); + EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag); - int flag = check ? MF_CHECKED : MF_UNCHECKED; - CheckMenuItem(GetHMENU(), Id, MF_BYCOMMAND | flag); + Refresh(); } -bool wxMenuBar::IsChecked(int Id) const +void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); - wxCHECK_MSG( item, FALSE, "wxMenuItem::IsChecked(): no such item" ); + m_titles[pos] = label; - int flag = ::GetMenuState(GetHMENU(), Id, MF_BYCOMMAND); + if ( !IsAttached() ) + { + return; + } + //else: have to modify the existing menu - return (flag & MF_CHECKED) != 0; -} + int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos); -bool wxMenuBar::IsEnabled(int Id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + UINT id; + UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION); + if ( flagsOld == 0xFFFFFFFF ) + { + wxLogLastError(wxT("GetMenuState")); + + return; + } - wxCHECK_MSG( item, FALSE, "wxMenuItem::IsEnabled(): no such item" ); + if ( flagsOld & MF_POPUP ) + { + // HIBYTE contains the number of items in the submenu in this case + flagsOld &= 0xff; + id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos); + } + else + { + id = pos; + } - int flag = ::GetMenuState(GetHMENU(), Id, MF_BYCOMMAND) ; +#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(wxT("ModifyMenu")); + } +#endif - return (flag & MF_ENABLED) != 0; + Refresh(); } -void wxMenuBar::SetLabel(int Id, const wxString& label) +wxString wxMenuBar::GetLabelTop(size_t pos) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetLabelTop") ); - if (!item) - return; - - HMENU hMenu = GetHMENU(); - UINT was_flag = ::GetMenuState(hMenu, Id, MF_BYCOMMAND); - ::ModifyMenu(hMenu, Id, MF_BYCOMMAND | MF_STRING | was_flag, Id, label); + return wxMenuItem::GetLabelFromText(m_titles[pos]); } -wxString wxMenuBar::GetLabel(int Id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - - wxCHECK_MSG( item, "", "wxMenuItem::GetLabel(): no such item" ); +// --------------------------------------------------------------------------- +// wxMenuBar construction +// --------------------------------------------------------------------------- - char tmp[128]; - int len = GetMenuString(GetHMENU(), Id, tmp, WXSIZEOF(tmp), MF_BYCOMMAND); - tmp[len] = '\0' ; +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) +{ + wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); + if ( !menuOld ) + return NULL; - return wxString(tmp); -} + m_titles[pos] = title; -void wxMenuBar::SetLabelTop(int pos, const wxString& label) -{ - UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ; - if (was_flag&MF_POPUP) + if ( IsAttached() ) { - was_flag &= 0xff ; - HMENU popup = GetSubMenu((HMENU)m_hMenu,pos) ; - ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,(UINT)popup,(const char *)label) ; - } - else - ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ; -} - -wxString wxMenuBar::GetLabelTop(int pos) const -{ - static char tmp[128] ; - int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ; - tmp[len] = '\0' ; - return wxString(tmp); -} + int mswpos = MSWPositionForWxMenu(menuOld,pos); -bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) -{ - if (!m_menuBarFrame) - return TRUE; + // can't use ModifyMenu() because it deletes the submenu it replaces + if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } - if (RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION)) { - m_menus[pos]->m_hMenu = m_menus[pos]->m_savehMenu; - m_menus[pos]->m_savehMenu = 0; + if ( !::InsertMenu(GetHmenu(), (UINT)mswpos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)GetHmenuOf(menu), title) ) + { + wxLogLastError(wxT("InsertMenu")); + } - if (m_menuBarFrame) { - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; +#if wxUSE_ACCEL + if ( menuOld->HasAccels() || menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); } +#endif // wxUSE_ACCEL - return TRUE; + Refresh(); } - return FALSE; + return menuOld; } -bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title) +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - if (!a_menu->m_hMenu) + // 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; - if (!m_menuBarFrame) - return TRUE; + m_titles.Insert(title, pos); - a_menu->m_savehMenu = a_menu->m_hMenu; - a_menu->m_hMenu = 0; - - AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)a_menu->m_savehMenu, title); + if ( IsAttached() ) + { +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) + 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 - DrawMenuBar((HWND)m_menuBarFrame->GetHWND()); + Refresh(); + } return TRUE; } -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { - if (!OnAppend(menu, title)) - return; + WXHMENU submenu = menu ? menu->GetHMenu() : 0; + wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") ); - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; + if ( !wxMenuBarBase::Append(menu, title) ) + return FALSE; - 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] = ""; - } - if (m_menus) + m_titles.Add(title); + + if ( IsAttached() ) { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) + 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 + +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accelerator table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + Refresh(); + } - ((wxMenu *)menu)->m_menuBar = (wxMenuBar *) this; - ((wxMenu *)menu)->SetParent(this); + return TRUE; } -void wxMenuBar::Delete(wxMenu * menu, int i) +wxMenu *wxMenuBar::Remove(size_t pos) { - int j; - int ii = (int) i; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; + + if ( IsAttached() ) + { +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) + 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; } -// Find the menu menuString, item itemString, and return the item id. -// Returns -1 if none found. -int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const -{ - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) - { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); - } - return -1; -} +#if wxUSE_ACCEL -wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const +void wxMenuBar::RebuildAccelTable() { - if (itemMenu) - *itemMenu = NULL; - - wxMenuItem *item = NULL; - int i; - for (i = 0; i < m_menuCount; i++) + // merge the accelerators of all menus into one accel table + size_t nAccelCount = 0; + size_t i, count = GetMenuCount(); + wxMenuList::iterator it; + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) { - item = m_menus[i]->FindItemForId (Id, itemMenu); - if (item) - return item; + nAccelCount += (*it)->GetAccelCount(); } - return NULL; -} -void wxMenuBar::SetHelpString (int Id, const wxString& helpString) -{ - int i; - for (i = 0; i < m_menuCount; i++) + if ( nAccelCount ) { - if (m_menus[i]->FindItemForId (Id)) + wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount]; + + nAccelCount = 0; + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) { - m_menus[i]->SetHelpString (Id, helpString); - return; + nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]); } + + m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries); + + delete [] accelEntries; } } -wxString wxMenuBar::GetHelpString (int Id) const +#endif // wxUSE_ACCEL + +void wxMenuBar::Attach(wxFrame *frame) { - wxString helpString; + wxMenuBarBase::Attach(frame); - for (int i = 0; i < m_menuCount; i++) +#if defined(__WXWINCE__) && _WIN32_WCE >= 400 + if (!m_hMenu) + this->Create(); +#if wxUSE_POCKETPC_UI + if (GetToolBar()) { - wxMenuItem *item = m_menus[i]->FindItemForId(Id); - if ( item ) + HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); + if (!CommandBar_InsertMenubarEx(hCommandBar, NULL, (LPTSTR) m_hMenu, 0)) { - helpString = item->GetHelp(); - - break; + wxLogLastError(wxT("CommandBar_InsertMenubarEx")); } } - - return helpString; -} - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -wxWindow *wxMenu::GetWindow() const -{ - if ( m_pInvokingWindow != NULL ) - return m_pInvokingWindow; - else if ( m_menuBar != NULL) - return m_menuBar->m_menuBarFrame; - - return NULL; -} - -WXHMENU wxMenu::GetHMenu() const -{ - if ( m_hMenu != 0 ) - return m_hMenu; - else if ( m_savehMenu != 0 ) - return m_savehMenu; - - wxFAIL_MSG("wxMenu without HMENU"); - - return 0; -} - -// 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) +#else + if (!m_commandBar) + m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId()); + if (m_commandBar) { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) + if (m_hMenu) { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( source ); - - if (source->ProcessEvent(event)) + if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0)) { - if (event.GetSetText()) - SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(id, event.GetEnabled()); + wxLogLastError(wxT("CommandBar_InsertMenubarEx")); } - - if (item->GetSubMenu()) - item->GetSubMenu()->UpdateUI(source); } - node = node->Next(); } +#endif + // wxUSE_POCKETPC_UI +#endif + // __WXWINCE__ && _WIN32_WCE >= 400 + +#if wxUSE_ACCEL + RebuildAccelTable(); +#endif // wxUSE_ACCEL +} + +void wxMenuBar::Detach() +{ + wxMenuBarBase::Detach(); } + +#endif // wxUSE_MENUS