X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50f1fb9226d9260454ccb9c8a67d0be23c2827f..4e15d1caa03346c126015019c1fdf093033ef40b:/src/msw/menu.cpp?ds=inline diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index ef870cc461..f1559bdb57 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/msw/menu.cpp // Purpose: wxMenu, wxMenuBar, wxMenuItem // Author: Julian Smart // 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,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "menu.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,46 +24,226 @@ #pragma hdrstop #endif +#if wxUSE_MENUS + +#include "wx/menu.h" + #ifndef WX_PRECOMP #include "wx/frame.h" - #include "wx/menu.h" #include "wx/utils.h" #include "wx/intl.h" + #include "wx/log.h" + #include "wx/image.h" #endif #if wxUSE_OWNER_DRAWN #include "wx/ownerdrw.h" #endif +#include "wx/scopedarray.h" +#include "wx/vector.h" + #include "wx/msw/private.h" -#include "wx/msw/menu.h" -#include "wx/menuitem.h" -#include "wx/log.h" +#include "wx/msw/wrapcctl.h" // include "properly" + +#ifdef __WXWINCE__ +#include +#include +#include +#include +#include +#if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__) +#include +#endif + +#include "wx/msw/wince/missing.h" + +#endif // other standard headers #include +#if wxUSE_OWNER_DRAWN + #include "wx/dynlib.h" +#endif + +#ifndef MNS_CHECKORBMP + #define MNS_CHECKORBMP 0x04000000 +#endif +#ifndef MIM_STYLE + #define MIM_STYLE 0x00000010 +#endif + // ---------------------------------------------------------------------------- // global variables // ---------------------------------------------------------------------------- -extern wxMenu *wxCurrentPopupMenu; - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- // the (popup) menu title has this special id -static const int idMenuTitle = -2; +static const int idMenuTitle = wxID_NONE; // ---------------------------------------------------------------------------- -// macros +// private helper classes and functions // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) - IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif +// Contains the data about the radio items groups in the given menu. +class wxMenuRadioItemsData +{ +public: + wxMenuRadioItemsData() { } + + // Default copy ctor, assignment operator and dtor are all ok. + + // Find the start and end of the group containing the given position or + // return false if it's not inside any range. + bool GetGroupRange(int pos, int *start, int *end) const + { + // We use a simple linear search here because there are not that many + // items in a menu and hence even fewer radio items ranges anyhow, so + // normally there is no need to do anything fancy (like keeping the + // array sorted and using binary search). + for ( Ranges::const_iterator it = m_ranges.begin(); + it != m_ranges.end(); + ++it ) + { + const Range& r = *it; + + if ( r.start <= pos && pos <= r.end ) + { + if ( start ) + *start = r.start; + if ( end ) + *end = r.end; + + return true; + } + } + + return false; + } + + // Take into account the new radio item about to be added at the given + // position. + // + // Returns true if this item starts a new radio group, false if it extends + // an existing one. + bool UpdateOnInsert(int pos) + { + bool inExistingGroup = false; + + for ( Ranges::iterator it = m_ranges.begin(); + it != m_ranges.end(); + ++it ) + { + Range& r = *it; + + if ( pos < r.start ) + { + // Item is inserted before this range, update its indices. + r.start++; + r.end++; + } + else if ( pos <= r.end + 1 ) + { + // Item is inserted in the middle of this range or immediately + // after it in which case it extends this range so make it span + // one more item in any case. + r.end++; + + inExistingGroup = true; + } + //else: Item is inserted after this range, nothing to do for it. + } + + if ( inExistingGroup ) + return false; + + // Make a new range for the group this item will belong to. + Range r; + r.start = pos; + r.end = pos; + m_ranges.push_back(r); + + return true; + } + +private: + // Contains the inclusive positions of the range start and end. + struct Range + { + int start; + int end; + }; + + typedef wxVector Ranges; + Ranges m_ranges; +}; + +namespace +{ + +// make the given menu item default +void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu), + UINT WXUNUSED_IN_WINCE(id)) +{ +#ifndef __WXWINCE__ + WinStruct mii; + mii.fMask = MIIM_STATE; + mii.fState = MFS_DEFAULT; + + if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#endif // !__WXWINCE__ +} + +// make the given menu item owner-drawn +void SetOwnerDrawnMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu), + UINT WXUNUSED_IN_WINCE(id), + ULONG_PTR WXUNUSED_IN_WINCE(data), + BOOL WXUNUSED_IN_WINCE(byPositon = FALSE)) +{ +#ifndef __WXWINCE__ + WinStruct mii; + mii.fMask = MIIM_FTYPE | MIIM_DATA; + mii.fType = MFT_OWNERDRAW; + mii.dwItemData = data; + + if ( reinterpret_cast(data)->IsSeparator() ) + mii.fType |= MFT_SEPARATOR; + + if ( !::SetMenuItemInfo(hmenu, id, byPositon, &mii) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#endif // !__WXWINCE__ +} + +#ifdef __WXWINCE__ +UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) +{ + WinStruct 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 // __WXWINCE__ + +inline bool IsGreaterThanStdSize(const wxBitmap& bmp) +{ + return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) || + bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK); +} + +} // anonymous namespace // ============================================================================ // implementation @@ -78,140 +254,230 @@ static const int idMenuTitle = -2; // --------------------------------------------------------------------------- // Construct a menu with optional title (then use append) -wxMenu::wxMenu(const wxString& title, const wxFunction func) - : m_title(title) +void wxMenu::InitNoCreate() { - 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_radioData = NULL; + m_doBreak = false; + +#if wxUSE_OWNER_DRAWN + m_ownerDrawn = false; + m_maxBitmapWidth = 0; + m_maxAccelWidth = -1; +#endif // wxUSE_OWNER_DRAWN +} + +void wxMenu::Init() +{ + InitNoCreate(); + + // create the menu + m_hMenu = (WXHMENU)CreatePopupMenu(); + if ( !m_hMenu ) { - Append(idMenuTitle, m_title) ; - AppendSeparator() ; + wxLogLastError(wxT("CreatePopupMenu")); } -#if WXWIN_COMPATIBILITY - Callback(func); -#endif + // if we have a title, insert it in the beginning of the menu + if ( !m_title.empty() ) + { + const wxString title = m_title; + m_title.clear(); // so that SetTitle() knows there was no title before + SetTitle(title); + } } -// The wxWindow destructor will take care of deleting the submenus. -wxMenu::~wxMenu() +wxMenu::wxMenu(WXHMENU hMenu) { - // free Windows resources - if ( m_hMenu ) + InitNoCreate(); + + m_hMenu = hMenu; + + // Ensure that our internal idea of how many items we have corresponds to + // the real number of items in the menu. + // + // We could also retrieve the real labels of the items here but it doesn't + // seem to be worth the trouble. + const int numExistingItems = ::GetMenuItemCount(m_hMenu); + for ( int n = 0; n < numExistingItems; n++ ) { - ::DestroyMenu((HMENU)m_hMenu); - m_hMenu = 0; + wxMenuBase::DoAppend(wxMenuItem::New(this, wxID_SEPARATOR)); } +} - // delete submenus - wxNode *node = m_menuItems.First(); - while ( node ) +// The wxWindow destructor will take care of deleting the submenus. +wxMenu::~wxMenu() +{ + // 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() ) { - 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 ( !::DestroyMenu(GetHmenu()) ) + { + wxLogLastError(wxT("DestroyMenu")); + } } + +#if wxUSE_ACCEL + // delete accels + WX_CLEAR_ARRAY(m_accels); +#endif // wxUSE_ACCEL + + delete m_radioData; } 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) +#if wxUSE_ACCEL + +int wxMenu::FindAccel(int id) const { - wxCHECK_RET( pItem != NULL, _T("can't append NULL item to the menu") ); + size_t n, count = m_accels.GetCount(); + for ( n = 0; n < count; n++ ) + { + if ( m_accels[n]->m_command == id ) + return n; + } -#if wxUSE_ACCEL - // check for accelerators: they are given after '\t' - wxString label = pItem->GetName(); - int posTab = label.Find(_T('\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(_T("Unknown accel modifier: '%s'"), - current.c_str()); - } + return wxNOT_FOUND; +} - current.Empty(); - } - else { - current += wxTolower(label[n]); - } +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() ) + { + // recurse upwards: we should only modify m_accels of the top level + // menus, not of the submenus as wxMenuBar doesn't look at them + // (alternative and arguable cleaner solution would be to recurse + // downwards in GetAccelCount() and CopyAccels()) + if ( GetParent() ) + { + GetParent()->UpdateAccel(item); + return; + } + + // find the (new) accel for this item + wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetItemLabel()); + 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 ( current.IsEmpty() ) { - wxLogDebug(_T("No accel key found, accel string ignored.")); + if ( IsAttached() ) + { + GetMenuBar()->RebuildAccelTable(); } - 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, _T("%d"), &n); - - keyCode = VK_F1 + n - 1; - } - else { - wxLogDebug(_T("Unrecognized accel key '%s', accel " - "string ignored."), current.c_str()); - } + +#if wxUSE_OWNER_DRAWN + ResetMaxAccelWidth(); +#endif + } + //else: it is a separator, they can't have accels, nothing to do +} + +#endif // wxUSE_ACCEL + +namespace +{ + +// helper of DoInsertOrAppend(): returns the HBITMAP to use in MENUITEMINFO +HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true) +{ + // Under versions of Windows older than Vista we can't pass HBITMAP + // directly as hbmpItem for 2 reasons: + // 1. We can't draw it with transparency then (this is not + // very important now but would be with themed menu bg) + // 2. Worse, Windows inverts the bitmap for the selected + // item and this looks downright ugly + // + // So we prefer to instead draw it ourselves in MSWOnDrawItem().by using + // HBMMENU_CALLBACK when inserting it + // + // However under Vista using HBMMENU_CALLBACK causes the entire menu to be + // drawn using the classic theme instead of the current one and it does + // handle transparency just fine so do use the real bitmap there +#if wxUSE_IMAGE + if ( wxGetWinVersion() >= wxWinVersion_Vista ) + { +#if wxUSE_OWNER_DRAWN + wxBitmap bmp = pItem->GetBitmap(checked); + if ( bmp.IsOk() ) + { + // we must use PARGB DIB for the menu bitmaps so ensure that we do + wxImage img(bmp.ConvertToImage()); + if ( !img.HasAlpha() ) + { + img.InitAlpha(); + pItem->SetBitmap(img, checked); } - } - if ( keyCode ) { - // do add an entry - m_accelKeyCodes.Add(keyCode); - m_accelFlags.Add(accelFlags); - m_accelIds.Add(pItem->GetId()); + return GetHbitmapOf(pItem->GetBitmap(checked)); } +#endif // wxUSE_OWNER_DRAWN + //else: bitmap is not set + + return NULL; } +#endif // wxUSE_IMAGE + + return HBMMENU_CALLBACK; +} + +} // anonymous namespace + +bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const +{ + return m_radioData && m_radioData->GetGroupRange(pos, start, end); +} + +// 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; + // we should support disabling the item even prior to adding it to the menu + UINT flags = pItem->IsEnabled() ? MF_ENABLED : MF_GRAYED; // 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; + m_doBreak = false; } if ( pItem->IsSeparator() ) { @@ -220,422 +486,516 @@ void wxMenu::Append(wxMenuItem *pItem) // id is the numeric id for normal menu items and HMENU for submenus as // required by ::AppendMenu() API - UINT id; + UINT_PTR id; wxMenu *submenu = pItem->GetSubMenu(); if ( submenu != NULL ) { - wxASSERT( submenu->GetHMenu() != (WXHMENU) NULL ); + wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") ); - id = (UINT)submenu->GetHMenu(); - submenu->m_topLevelMenu = m_topLevelMenu; - submenu->m_parent = this; - submenu->m_savehMenu = (WXHMENU)id; - submenu->m_hMenu = 0; + submenu->SetParent(this); + + id = (UINT_PTR)submenu->GetHMenu(); flags |= MF_POPUP; } else { - id = pItem->GetId(); + id = pItem->GetMSWId(); } - 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 = (LPCTSTR)pItem; - } - else -#endif + // prepare to insert the item in the menu + wxString itemText = pItem->GetItemLabel(); + LPCTSTR pData = NULL; + if ( pos == (size_t)-1 ) { - // menu is just a normal string (passed in data parameter) - flags |= MF_STRING; - pData = label; + // append at the end (note that the item is already appended to + // internal data structures) + pos = GetMenuItemCount() - 1; } - if ( !::AppendMenu(GetHmenu(), flags, id, pData) ) + // Update radio groups data if we're inserting a new radio item. + // + // NB: If we supported inserting non-radio items in the middle of existing + // radio groups to break them into two subgroups, we'd need to update + // m_radioData in this case too but currently this is not supported. + bool checkInitially = false; + if ( pItem->GetKind() == wxITEM_RADIO ) { - wxLogLastError("AppendMenu"); + if ( !m_radioData ) + m_radioData = new wxMenuRadioItemsData; + + if ( m_radioData->UpdateOnInsert(pos) ) + checkInitially = true; } - else + + // adjust position to account for the title of a popup menu, if any + if ( !GetMenuBar() && !m_title.empty() ) + pos += 2; // for the title itself and its separator + + BOOL ok = false; + +#if wxUSE_OWNER_DRAWN + // Under older systems mixing owner-drawn and non-owner-drawn items results + // in inconsistent margins, so we force this one to be owner-drawn if any + // other items already are. + if ( m_ownerDrawn ) + pItem->SetOwnerDrawn(true); +#endif // wxUSE_OWNER_DRAWN + + // check if we have something more than a simple text item +#if wxUSE_OWNER_DRAWN + if ( pItem->IsOwnerDrawn() ) { -#ifdef __WIN32__ - if ( id == idMenuTitle ) +#ifndef __DMC__ + + if ( !m_ownerDrawn && !pItem->IsSeparator() ) { - // visually select the menu title - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = MFS_DEFAULT; + // MIIM_BITMAP only works under WinME/2000+ so we always use owner + // drawn item under the previous versions and we also have to use + // them in any case if the item has custom colours or font + static const wxWinVersion winver = wxGetWinVersion(); + bool mustUseOwnerDrawn = winver < wxWinVersion_98 || + pItem->GetTextColour().IsOk() || + pItem->GetBackgroundColour().IsOk() || + pItem->GetFont().IsOk(); + + if ( !mustUseOwnerDrawn ) + { + const wxBitmap& bmpUnchecked = pItem->GetBitmap(false), + bmpChecked = pItem->GetBitmap(true); + + if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked)) || + (bmpChecked.IsOk() && IsGreaterThanStdSize(bmpChecked)) ) + { + mustUseOwnerDrawn = true; + } + } + + // use InsertMenuItem() if possible as it's guaranteed to look + // correct while our owner-drawn code is not + if ( !mustUseOwnerDrawn ) + { + WinStruct mii; + mii.fMask = MIIM_STRING | MIIM_DATA; + + // don't set hbmpItem for the checkable items as it would + // be used for both checked and unchecked state + if ( pItem->IsCheckable() ) + { + mii.fMask |= MIIM_CHECKMARKS; + mii.hbmpChecked = GetHBitmapForMenu(pItem, true); + mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false); + } + else if ( pItem->GetBitmap().IsOk() ) + { + mii.fMask |= MIIM_BITMAP; + mii.hbmpItem = GetHBitmapForMenu(pItem); + } + + mii.cch = itemText.length(); + mii.dwTypeData = wxMSW_CONV_LPTSTR(itemText); + + if ( flags & MF_POPUP ) + { + mii.fMask |= MIIM_SUBMENU; + mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu()); + } + else + { + mii.fMask |= MIIM_ID; + mii.wID = id; + } + + mii.dwItemData = reinterpret_cast(pItem); + + ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii); + if ( !ok ) + { + wxLogLastError(wxT("InsertMenuItem()")); + } + else // InsertMenuItem() ok + { + // we need to remove the extra indent which is reserved for + // the checkboxes by default as it looks ugly unless check + // boxes are used together with bitmaps and this is not the + // case in wx API + WinStruct mi; + + // don't call SetMenuInfo() directly, this would prevent + // the app from starting up under Windows 95/NT 4 + typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *); + + wxDynamicLibrary dllUser(wxT("user32")); + wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser); + if ( pfnSetMenuInfo ) + { + mi.fMask = MIM_STYLE; + mi.dwStyle = MNS_CHECKORBMP; + if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) ) + { + wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)")); + } + } + + // tell the item that it's not really owner-drawn but only + // needs to draw its bitmap, the rest is done by Windows + pItem->SetOwnerDrawn(false); + } + } + } +#endif // __DMC__ + + if ( !ok ) + { + // item draws itself, pass pointer to it in data parameter + flags |= MF_OWNERDRAW; + pData = (LPCTSTR)pItem; + + bool updateAllMargins = false; + + // get size of bitmap always return valid value (0 for invalid bitmap), + // so we don't needed check if bitmap is valid ;) + int uncheckedW = pItem->GetBitmap(false).GetWidth(); + int checkedW = pItem->GetBitmap(true).GetWidth(); + + if ( m_maxBitmapWidth < uncheckedW ) + { + m_maxBitmapWidth = uncheckedW; + updateAllMargins = true; + } + + if ( m_maxBitmapWidth < checkedW ) + { + m_maxBitmapWidth = checkedW; + updateAllMargins = true; + } - if ( !SetMenuItemInfo(GetHmenu(), (unsigned)id, FALSE, &mii) ) + // make other item ownerdrawn and update margin width for equals alignment + if ( !m_ownerDrawn || updateAllMargins ) { - wxLogLastError(_T("SetMenuItemInfo")); + // we must use position in SetOwnerDrawnMenuItem because + // all separators have the same id + int pos = 0; + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem* item = node->GetData(); + + if ( !item->IsOwnerDrawn()) + { + item->SetOwnerDrawn(true); + SetOwnerDrawnMenuItem(GetHmenu(), pos, + reinterpret_cast(item), TRUE); + } + + item->SetMarginWidth(m_maxBitmapWidth); + + node = node->GetNext(); + pos++; + } + + // set menu as ownerdrawn + m_ownerDrawn = true; + + ResetMaxAccelWidth(); + } + // only update our margin for equals alignment to other item + else if ( !updateAllMargins ) + { + pItem->SetMarginWidth(m_maxBitmapWidth); } } -#endif // __WIN32__ + } + else +#endif // wxUSE_OWNER_DRAWN + { + // item is just a normal string (passed in data parameter) + flags |= MF_STRING; + +#ifdef __WXWINCE__ + itemText = wxMenuItem::GetLabelText(itemText); +#endif - m_menuItems.Append(pItem); - m_noItems++; + pData = itemText.t_str(); } -} -void wxMenu::AppendSeparator() -{ - Append(new wxMenuItem(this, ID_SEPARATOR)); + // item might have already been inserted by InsertMenuItem() above + if ( !ok ) + { + if ( !::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData) ) + { + wxLogLastError(wxT("InsertMenu[Item]()")); + + return false; + } + } + + + // Check the item if it should be initially checked. + if ( checkInitially ) + pItem->Check(true); + + // if we just appended the title, highlight it + if ( id == (UINT_PTR)idMenuTitle ) + { + // visually select the menu title + SetDefaultMenuItem(GetHmenu(), id); + } + + // if we're already attached to the menubar, we must update it + if ( IsAttached() && GetMenuBar()->IsAttached() ) + { + GetMenuBar()->Refresh(); + } + + return true; } -// 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)); + return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item) ? item : NULL; } -// 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 item's 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, _T("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 an 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); + +#if wxUSE_OWNER_DRAWN + ResetMaxAccelWidth(); +#endif } - 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 change won't be visible + GetMenuBar()->Refresh(); + } -#if wxUSE_ACCEL + // and from internal data structures + return wxMenuBase::DoRemove(item); +} // --------------------------------------------------------------------------- // accelerator helpers // --------------------------------------------------------------------------- -// create the wxAcceleratorEntries for our accels and put them into provided +#if wxUSE_ACCEL + +// create the wxAcceleratorEntries for our accels and put them into the provided // array - return the number of accels we have 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; } -#endif // wxUSE_ACCEL - -// --------------------------------------------------------------------------- -// wxMenu functions implemented in wxMenuItem -// --------------------------------------------------------------------------- - -void wxMenu::Enable(int id, bool Flag) -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_RET( item != NULL, _T("can't enable non-existing menu item") ); - - item->Enable(Flag); -} - -bool wxMenu::IsEnabled(int id) const +wxAcceleratorTable *wxMenu::CreateAccelTable() const { - wxMenuItem *item = FindItemForId(id); - wxCHECK_MSG( item != NULL, FALSE, _T("invalid item id") ); + const size_t count = m_accels.size(); + wxScopedArray accels(new wxAcceleratorEntry[count]); + CopyAccels(accels.get()); - return item->IsEnabled(); + return new wxAcceleratorTable(count, accels.get()); } -void wxMenu::Check(int id, bool Flag) -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_RET( item != NULL, _T("can't get status of non-existing menu item") ); - - item->Check(Flag); -} +#endif // wxUSE_ACCEL -bool wxMenu::IsChecked(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_MSG( item != NULL, FALSE, _T("invalid item id") ); +// --------------------------------------------------------------------------- +// ownerdrawn helpers +// --------------------------------------------------------------------------- - return item->IsChecked(); -} +#if wxUSE_OWNER_DRAWN -void wxMenu::SetLabel(int id, const wxString& label) +void wxMenu::CalculateMaxAccelWidth() { - wxMenuItem *item = FindItemForId(id) ; - wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") ); - - item->SetName(label); -} + wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") ); -wxString wxMenu::GetLabel(int id) const -{ - wxString label; - wxMenuItem *pItem = FindItemForId(id) ; - if (pItem) - label = pItem->GetName() ; - else - wxFAIL_MSG(_T("wxMenu::GetLabel: item doesn't exist")); + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem* item = node->GetData(); - return label; -} + if ( item->IsOwnerDrawn() ) + { + int width = item->MeasureAccelWidth(); + if (width > m_maxAccelWidth ) + m_maxAccelWidth = width; + } -void wxMenu::SetHelpString(int itemId, const wxString& helpString) -{ - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); - else - wxFAIL_MSG(_T("wxMenu::SetHelpString: item doesn't exist")); + node = node->GetNext(); + } } -wxString wxMenu::GetHelpString (int itemId) const -{ - wxString help; - wxMenuItem *item = FindItemForId (itemId); - if (item) - help = item->GetHelp(); - else - wxFAIL_MSG(_T("wxMenu::GetHelpString: item doesn't exist")); - - return help; -} +#endif // wxUSE_OWNER_DRAWN // --------------------------------------------------------------------------- -// wxMenu title +// set wxMenu title // --------------------------------------------------------------------------- void wxMenu::SetTitle(const wxString& label) { - bool hasNoTitle = m_title.IsEmpty(); + bool hasNoTitle = m_title.empty(); m_title = label; HMENU hMenu = GetHmenu(); if ( hasNoTitle ) { - if ( !label.IsEmpty() ) + if ( !label.empty() ) { - 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, + (UINT_PTR)idMenuTitle, m_title.t_str()) || + !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) { - wxLogLastError(_T("InsertMenu")); + wxLogLastError(wxT("InsertMenu")); } } } else { - if ( label.IsEmpty() ) + if ( label.empty() ) { // remove the title and the separator after it if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) || !RemoveMenu(hMenu, 0, MF_BYPOSITION) ) { - wxLogLastError("RemoveMenu"); + wxLogLastError(wxT("RemoveMenu")); } } else - { - // modify the title - if ( !ModifyMenu(hMenu, 0u, - MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) ) - { - wxLogLastError("ModifyMenu"); - } - } - } - -#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"); - } - } -#endif -} - -const wxString wxMenu::GetTitle() const -{ - return m_title; -} - -// --------------------------------------------------------------------------- -// event processing -// --------------------------------------------------------------------------- - -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; - -#if WXWIN_COMPATIBILITY - // Try a callback - if (m_callback) - { - (void)(*(m_callback))(*this, event); - processed = TRUE; + { + // modify the title +#ifdef __WXWINCE__ + WinStruct info; + info.fMask = MIIM_TYPE; + info.fType = MFT_STRING; + info.cch = m_title.length(); + info.dwTypeData = wxMSW_CONV_LPTSTR(m_title); + if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#else + if ( !ModifyMenu(hMenu, 0u, + MF_BYPOSITION | MF_STRING, + (UINT_PTR)idMenuTitle, m_title.t_str()) ) + { + wxLogLastError(wxT("ModifyMenu")); + } +#endif + } } -#endif // WXWIN_COMPATIBILITY - // Try the menu's event handler - if ( !processed && GetEventHandler()) +#ifdef __WIN32__ + // put the title string in bold face + if ( !m_title.empty() ) { - processed = GetEventHandler()->ProcessEvent(event); + SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle); } - - // 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; +#endif // Win32 } // --------------------------------------------------------------------------- -// Item search +// event processing // --------------------------------------------------------------------------- -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const +bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_) { - wxString itemLabel = wxStripMenuCodes(itemString); - for ( wxNode *node = m_menuItems.First(); node; node = node->Next() ) + const int id = (signed short)id_; + + // ignore commands from the menu title + if ( id != idMenuTitle ) { - wxMenuItem *item = (wxMenuItem *)node->Data(); - if ( item->IsSubMenu() ) - { - int ans = item->GetSubMenu()->FindItem(itemString); - if ( ans != wxNOT_FOUND ) - return ans; - } - else if ( !item->IsSeparator() ) + // Default value for uncheckable items. + int checked = -1; + + // update the check item when it's clicked + wxMenuItem * const item = FindItem(id); + if ( item && item->IsCheckable() ) { - wxString label = wxStripMenuCodes(item->GetName()); - if ( itemLabel == label ) - return item->GetId(); + item->Toggle(); + + // Get the status of the menu item: note that it has been just changed + // by Toggle() above so here we already get the new state of the item. + // + // Also notice that we must pass unsigned id_ and not sign-extended id + // to ::GetMenuState() as this is what it expects. + UINT menuState = ::GetMenuState(GetHmenu(), id_, MF_BYCOMMAND); + checked = (menuState & MF_CHECKED) != 0; } + + SendEvent(id, checked); } - return wxNOT_FOUND; + return true; } -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const +// get the menu with given handle (recursively) +#if wxUSE_OWNER_DRAWN +wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu) { - if ( itemMenu ) - *itemMenu = NULL; + // check self + if ( GetHMenu() == hMenu ) + return this; - wxMenuItem *item = NULL; - for ( wxNode *node = m_menuItems.First(); node && !item; node = node->Next() ) + // recursively query submenus + for ( size_t n = 0 ; n < GetMenuItemCount(); ++n ) { - item = (wxMenuItem *)node->Data(); - - if ( item->GetId() == itemId ) - { - if (itemMenu) - *itemMenu = (wxMenu *)this; - } - else if ( item->IsSubMenu() ) - { - item = item->GetSubMenu()->FindItemForId(itemId, itemMenu); - } - else + wxMenuItem* item = FindItemByPosition(n); + wxMenu* submenu = item->GetSubMenu(); + if ( submenu ) { - // don't exit the loop - item = NULL; + submenu = submenu->MSWGetMenu(hMenu); + if (submenu) + return submenu; } } - return item; -} - -// --------------------------------------------------------------------------- -// 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, _T("menu belongs to 2 menubars, expect a crash") ); - - m_menuBar = menubar; - m_savehMenu = m_hMenu; - m_hMenu = 0; -} - -void wxMenu::Detach() -{ - wxASSERT_MSG( m_menuBar, _T("can't detach menu if it's not attached") ); - - m_hMenu = m_savehMenu; - m_savehMenu = 0; + // unknown hMenu + return NULL; } +#endif // wxUSE_OWNER_DRAWN // --------------------------------------------------------------------------- // Menu Bar @@ -644,11 +1004,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() @@ -661,31 +1027,47 @@ 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]; - - int i; - for ( i = 0; i < count; i++ ) - m_titles[i] = titles[i]; + for ( size_t i = 0; i < count; i++ ) + { + // We just want to store the menu title in the menu itself, not to + // show it as a dummy item in the menu itself as we do with the popup + // menu titles in overridden wxMenu::SetTitle(). + menus[i]->wxMenuBase::SetTitle(titles[i]); + m_menus.Append(menus[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 } // --------------------------------------------------------------------------- @@ -694,151 +1076,175 @@ wxMenuBar::~wxMenuBar() void wxMenuBar::Refresh() { - wxCHECK_RET( m_menuBarFrame, _T("can't refresh a menubar withotu a frame") ); + if ( IsFrozen() ) + return; + + 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() { - wxCHECK_MSG( !m_hMenu, TRUE, _T("menubar already created") ); + // Note: this doesn't work at all 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; + + wxToolMenuBar * const bar = static_cast(GetToolBar()); + if ( !bar ) + return NULL; + + HWND hCommandBar = GetHwndOf(bar); + + // notify comctl32.dll about the version of the headers we use before using + // any other TB_XXX messages + SendMessage(hCommandBar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + TBBUTTON tbButton; + wxZeroMemory(tbButton); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | + TBSTYLE_NO_DROPDOWN_ARROW | + TBSTYLE_AUTOSIZE; + + for ( unsigned i = 0; i < GetMenuCount(); i++ ) + { + HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu(); + tbButton.dwData = (DWORD)hPopupMenu; + wxString label = wxStripMenuCodes(GetMenuLabel(i)); + tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label); + + tbButton.idCommand = NewControlId(); + if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) ) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + } + } + + m_hMenu = bar->GetHMenu(); + return m_hMenu; +#else // !__WXWINCE__ + 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++ ) + for ( wxMenuList::iterator it = m_menus.begin(); + it != m_menus.end(); + ++it ) { if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, - (UINT)m_menus[i]->GetHMenu(), - m_titles[i]) ) + (UINT_PTR)(*it)->GetHMenu(), + (*it)->GetTitle().t_str()) ) { - wxLogLastError("AppendMenu"); + wxLogLastError(wxT("AppendMenu")); } } } return m_hMenu; +#endif // __WXWINCE__/!__WXWINCE__ } -// --------------------------------------------------------------------------- -// 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, _T("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, _T("attempt to check an item which doesn't exist") ); - wxCHECK_RET( item->IsCheckable(), _T("attempt to check an uncheckable item") ); - - item->Check(check); -} - -bool wxMenuBar::IsChecked(int id) const +int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked(): 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 - return (flag & MF_CHECKED) != 0; + int i; // For old C++ compatibility + for(i=wxpos; iGetHMenu()) + return i; + } + for(i=0; iGetHMenu()) + return i; + } + wxFAIL; + return -1; } -bool wxMenuBar::IsEnabled(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled(): no such item") ); - - int flag = ::GetMenuState(GetHmenuOf(itemMenu), id, MF_BYCOMMAND) ; +// --------------------------------------------------------------------------- +// wxMenuBar functions to work with the top level submenus +// --------------------------------------------------------------------------- - return (flag & MF_ENABLED) != 0; -} +// 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 -void wxMenuBar::SetLabel(int id, const wxString& label) +void wxMenuBar::EnableTop(size_t pos, bool enable) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, _T("wxMenuBar::SetLabel(): no such item") ); - - item->SetName(label); -} + wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); -wxString wxMenuBar::GetLabel(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; + int flag = enable ? MF_ENABLED : MF_GRAYED; - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel(): no such item") ); + EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag); - return item->GetName(); + Refresh(); } -void wxMenuBar::SetHelpString (int id, const wxString& helpString) +bool wxMenuBar::IsEnabledTop(size_t pos) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, _T("wxMenuBar::SetHelpString(): no such item") ); + wxCHECK_MSG( pos < GetMenuCount(), false, wxS("invalid menu index") ); + WinStruct mii; + mii.fMask = MIIM_STATE; + if ( !::GetMenuItemInfo(GetHmenu(), pos, TRUE, &mii) ) + { + wxLogLastError(wxS("GetMenuItemInfo(menubar)")); + } - item->SetHelp(helpString); + return !(mii.fState & MFS_GRAYED); } -wxString wxMenuBar::GetHelpString (int id) const +void wxMenuBar::SetMenuLabel(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, _T(""), _T("wxMenuBar::GetHelpString(): no such item") ); - - return item->GetHelp(); -} + m_menus[pos]->wxMenuBase::SetTitle(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_PTR id; + UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION); if ( flagsOld == 0xFFFFFFFF ) { - wxLogLastError(_T("GetMenuState")); + wxLogLastError(wxT("GetMenuState")); return; } @@ -846,163 +1252,272 @@ 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_PTR)::GetSubMenu((HMENU)m_hMenu, mswpos); } else { id = pos; } - if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld, - id, label) == 0xFFFFFFFF ) +#ifdef __WXWINCE__ + WinStruct info; + info.fMask = MIIM_TYPE; + info.fType = MFT_STRING; + info.cch = label.length(); + info.dwTypeData = wxMSW_CONV_LPTSTR(label); + if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } + +#else + if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld, + id, label.t_str()) == (int)0xFFFFFFFF ) { - wxLogLastError("ModifyMenu"); + wxLogLastError(wxT("ModifyMenu")); } +#endif + + Refresh(); } -wxString wxMenuBar::GetLabelTop(int pos) const +wxString wxMenuBar::GetMenuLabel(size_t pos) const { - int len = ::GetMenuString((HMENU)m_hMenu, pos, NULL, 0, MF_BYCOMMAND); - - len++; // for the NUL character - wxString label; - ::GetMenuString(GetHmenu(), pos, label.GetWriteBuf(len), len, MF_BYCOMMAND); - label.UngetWriteBuf(); + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetMenuLabel") ); - return label; + return m_menus[pos]->GetTitle(); } // --------------------------------------------------------------------------- -// 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; + wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); + if ( !menuOld ) + return NULL; + + menu->wxMenuBase::SetTitle(title); - if ( ::RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION) ) +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (IsAttached()) +#else + if (GetHmenu()) +#endif { - // VZ: I'm not sure about what's going on here, so I leave an assert - wxASSERT_MSG( m_menus[pos] == a_menu, _T("what is this parameter for??") ); + int mswpos = MSWPositionForWxMenu(menuOld,pos); - a_menu->Detach(); + // can't use ModifyMenu() because it deletes the submenu it replaces + if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } - if ( m_menuBarFrame ) - Refresh(); + if ( !::InsertMenu(GetHmenu(), (UINT)mswpos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT_PTR)GetHmenuOf(menu), title.t_str()) ) + { + wxLogLastError(wxT("InsertMenu")); + } - return TRUE; - } - else - { - wxLogLastError("RemoveMenu"); +#if wxUSE_ACCEL + if ( menuOld->HasAccels() || menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + if (IsAttached()) + Refresh(); } - return FALSE; + return menuOld; } -bool wxMenuBar::OnAppend(wxMenu *a_menu, const wxChar *title) +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - WXHMENU submenu = a_menu->GetHMenu(); - if ( !submenu ) - return FALSE; + // 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 + bool isAttached = +#if defined(WINCE_WITHOUT_COMMANDBAR) + IsAttached(); +#else + (GetHmenu() != 0); +#endif - if ( !m_menuBarFrame ) - return TRUE; + int mswpos = (!isAttached || (pos == m_menus.GetCount())) + ? -1 // append the menu + : MSWPositionForWxMenu(GetMenu(pos),pos); - a_menu->Attach(this); + if ( !wxMenuBarBase::Insert(pos, menu, title) ) + return false; - if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, - (UINT)submenu, title) ) + menu->wxMenuBase::SetTitle(title); + + if ( isAttached ) { - wxLogLastError(_T("AppendMenu")); - } +#if defined(WINCE_WITHOUT_COMMANDBAR) + 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) wxMSW_CONV_LPCTSTR(label); + + tbButton.idCommand = NewControlId(); + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton)) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + return false; + } + wxUnusedVar(mswpos); +#else + if ( !::InsertMenu(GetHmenu(), mswpos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT_PTR)GetHmenuOf(menu), title.t_str()) ) + { + wxLogLastError(wxT("InsertMenu")); + } +#endif +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); + } - return TRUE; + return true; } -// --------------------------------------------------------------------------- -// wxMenuBar construction -// --------------------------------------------------------------------------- - -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] = _T(""); - } - if (m_menus) + menu->wxMenuBase::SetTitle(title); + +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (IsAttached()) +#else + if (GetHmenu()) +#endif { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; +#if defined(WINCE_WITHOUT_COMMANDBAR) + 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) wxMSW_CONV_LPCTSTR(label); + + 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_PTR)submenu, title.t_str()) ) + { + 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; + if (IsAttached()) + Refresh(); + } - menu->SetParent(this); + return true; } -void wxMenuBar::Delete(wxMenu * menu, int i) +wxMenu *wxMenuBar::Remove(size_t pos) { - int j; - int ii = (int) i; - - if (menu != 0) { - for (ii = 0; ii < m_menuCount; ii++) { - if (m_menus[ii] == menu) - break; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; + +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (IsAttached()) +#else + if (GetHmenu()) +#endif + { +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (GetToolBar()) + { + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) + { + wxLogLastError(wxT("TB_DELETEBUTTON")); + } } - if (ii >= m_menuCount) - return; - } else { - if (ii < 0 || ii >= m_menuCount) - return; - menu = m_menus[ii]; - } - - if (!OnDelete(menu, ii)) - return; +#else + if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } +#endif - menu->SetParent(NULL); +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; + if (IsAttached()) + Refresh(); } -} - -void wxMenuBar::Attach(wxFrame *frame) -{ - wxASSERT_MSG( !m_menuBarFrame, _T("menubar already attached!") ); - m_menuBarFrame = frame; + return menu; +} #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 ) @@ -1010,113 +1525,89 @@ 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); + SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries)); delete [] accelEntries; } -#endif // wxUSE_ACCEL } -// --------------------------------------------------------------------------- -// wxMenuBar searching for menu items -// --------------------------------------------------------------------------- +#endif // wxUSE_ACCEL -// 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; + return false; } +#endif - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -wxWindow *wxMenu::GetWindow() const +void wxMenuBar::Detach() { - if ( m_pInvokingWindow != NULL ) - return m_pInvokingWindow; - else if ( m_menuBar != NULL) - return m_menuBar->GetFrame(); - - return NULL; + wxMenuBarBase::Detach(); } -WXHMENU wxMenu::GetHMenu() const +// get the menu with given handle (recursively) +wxMenu* wxMenuBar::MSWGetMenu(WXHMENU hMenu) { - if ( m_hMenu != 0 ) - return m_hMenu; - else if ( m_savehMenu != 0 ) - return m_savehMenu; + wxCHECK_MSG( GetHMenu() != hMenu, NULL, + wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") ); - wxFAIL_MSG(_T("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) +#if wxUSE_OWNER_DRAWN + // query all menus + for ( size_t n = 0 ; n < GetMenuCount(); ++n ) { - 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(); + wxMenu* menu = GetMenu(n)->MSWGetMenu(hMenu); + if ( menu ) + return menu; } +#endif + + // unknown hMenu + return NULL; } + +#endif // wxUSE_MENUS