/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "menu.h"
-#endif
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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 <commctrl.h> "properly"
+
+#ifdef __WXWINCE__
+#include <windows.h>
+#include <windowsx.h>
+#include <tchar.h>
+#include <ole2.h>
+#include <shellapi.h>
+#if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__)
+#include <aygshell.h>
+#endif
+
+#include "wx/msw/wince/missing.h"
+
+#endif
// other standard headers
#include <string.h>
+#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.
-// convenience macro
-#define GetHMENU() ((HMENU)GetHMenu())
-#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu())
+ // 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<Range> 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<MENUITEMINFO> 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<MENUITEMINFO> mii;
+ mii.fMask = MIIM_FTYPE | MIIM_DATA;
+ mii.fType = MFT_OWNERDRAW;
+ mii.dwItemData = data;
+
+ if ( reinterpret_cast<wxMenuItem*>(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<MENUITEMINFO> 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
// ============================================================================
-// Menus
+// ---------------------------------------------------------------------------
+// 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::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;
+ m_radioData = NULL;
+ m_doBreak = false;
- if ( !!m_title )
+#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"));
}
- Callback(func);
+ // 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);
+ }
+}
+
+wxMenu::wxMenu(WXHMENU 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++ )
+ {
+ wxMenuBase::DoAppend(wxMenuItem::New(this, wxID_SEPARATOR));
+ }
}
// 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)
+#if wxUSE_ACCEL
+ // delete accels
+ WX_CLEAR_ARRAY(m_accels);
+#endif // wxUSE_ACCEL
+
+ delete m_radioData;
+}
+
+void wxMenu::Break()
+{
+ // this will take effect during the next call to Append()
+ m_doBreak = true;
+}
+
+#if wxUSE_ACCEL
+
+int wxMenu::FindAccel(int id) const
+{
+ size_t n, count = m_accels.GetCount();
+ for ( n = 0; n < count; n++ )
{
- wxMenuItem *item = (wxMenuItem *)node->Data();
+ 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() )
+ {
+ // 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();
- // Delete child menus.
- // Beware: they must not be appended to children list!!!
- // (because order of delete is significant)
- if (item->GetSubMenu())
- item->DeleteSubMenu();
+ // 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);
+ }
- wxNode *next = node->Next();
- delete item;
- delete node;
- node = next;
+ if ( IsAttached() )
+ {
+ GetMenuBar()->RebuildAccelTable();
+ }
+
+#if wxUSE_OWNER_DRAWN
+ ResetMaxAccelWidth();
+#endif
}
- /*
- if (m_hMenu)
- DestroyMenu(m_hMenu);
- m_hMenu = 0;
- */
+ //else: it is a separator, they can't have accels, nothing to do
}
-void wxMenu::Break()
+#endif // wxUSE_ACCEL
+
+namespace
+{
+
+// helper of DoInsertOrAppend(): returns the HBITMAP to use in MENUITEMINFO
+HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
{
- m_doBreak = 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);
+ }
+
+ return GetHbitmapOf(pItem->GetBitmap(checked));
+ }
+#endif // wxUSE_OWNER_DRAWN
+ //else: bitmap is not set
+
+ return NULL;
+ }
+#endif // wxUSE_IMAGE
+
+ return HBMMENU_CALLBACK;
}
-// function appends a new item or submenu to the menu
-void wxMenu::Append(wxMenuItem *pItem)
+} // anonymous namespace
+
+bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const
{
- wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
+ return m_radioData && m_radioData->GetGroupRange(pos, start, end);
+}
- m_menuItems.Append(pItem);
+// 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() ) {
flags |= MF_SEPARATOR;
}
- // id is the numeric id for normal menu items and HMENU for submenus
- UINT id;
- wxMenu *SubMenu = pItem->GetSubMenu();
- if ( SubMenu != NULL ) {
- wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL );
+ // id is the numeric id for normal menu items and HMENU for submenus as
+ // required by ::AppendMenu() API
+ UINT_PTR id;
+ 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_PTR)submenu->GetHMenu();
flags |= MF_POPUP;
}
else {
- id = pItem->GetId();
+ id = pItem->GetMSWId();
+ }
+
+
+ // prepare to insert the item in the menu
+ wxString itemText = pItem->GetItemLabel();
+ LPCTSTR pData = NULL;
+ if ( pos == (size_t)-1 )
+ {
+ // append at the end (note that the item is already appended to
+ // internal data structures)
+ pos = GetMenuItemCount() - 1;
}
- LPCSTR 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 )
+ {
+ if ( !m_radioData )
+ m_radioData = new wxMenuRadioItemsData;
+ if ( m_radioData->UpdateOnInsert(pos) )
+ checkInitially = true;
+ }
+
+ // 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() ) { // want to get {Measure|Draw}Item messages?
- // item draws itself, pass pointer to it in data parameter
- flags |= MF_OWNERDRAW;
- pData = (LPCSTR)pItem;
+ if ( pItem->IsOwnerDrawn() )
+ {
+#ifndef __DMC__
+
+ if ( !m_ownerDrawn && !pItem->IsSeparator() )
+ {
+ // 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<MENUITEMINFO> 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 = const_cast<wxChar *>(itemText.wx_str());
+
+ 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<ULONG_PTR>(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<MENUINFO> 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;
+ }
+
+ // make other item ownerdrawn and update margin width for equals alignment
+ if ( !m_ownerDrawn || updateAllMargins )
+ {
+ // 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<ULONG_PTR>(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);
+ }
+ }
}
else
-#endif
+#endif // wxUSE_OWNER_DRAWN
{
- // menu is just a normal string (passed in data parameter)
+ // item is just a normal string (passed in data parameter)
flags |= MF_STRING;
- pData = pItem->GetName();
+
+#ifdef __WXWINCE__
+ itemText = wxMenuItem::GetLabelText(itemText);
+#endif
+
+ pData = (wxChar*)itemText.wx_str();
}
- // visually select the menu title
- if ( id == idMenuTitle )
+ // item might have already been inserted by InsertMenuItem() above
+ if ( !ok )
{
- // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face
+ if ( !::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData) )
+ {
+ wxLogLastError(wxT("InsertMenu[Item]()"));
+
+ return false;
+ }
}
- if ( !AppendMenu(GetHMENU(), flags, id, pData) )
+
+ // 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 )
{
- wxLogLastError("AppendMenu");
+ // visually select the menu title
+ SetDefaultMenuItem(GetHmenu(), id);
}
- m_noItems++;
-}
+ // if we're already attached to the menubar, we must update it
+ if ( IsAttached() && GetMenuBar()->IsAttached() )
+ {
+ GetMenuBar()->Refresh();
+ }
-void wxMenu::AppendSeparator()
-{
- Append(new wxMenuItem(this, ID_SEPARATOR));
+ 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;
}
-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, "wxMenu::Delete(): item doesn't exist" );
+ // 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];
- HMENU menu = GetHMENU();
+ m_accels.RemoveAt(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();
+#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"));
+ }
+
+ if ( IsAttached() && GetMenuBar()->IsAttached() )
+ {
+ // otherwise, the change won't be visible
+ GetMenuBar()->Refresh();
}
- m_menuItems.DeleteNode(node);
- delete item;
+ // and from internal data structures
+ return wxMenuBase::DoRemove(item);
}
-void wxMenu::Enable(int id, bool Flag)
-{
- wxMenuItem *item = FindItemForId(id);
- wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );
+// ---------------------------------------------------------------------------
+// accelerator helpers
+// ---------------------------------------------------------------------------
- item->Enable(Flag);
-}
+#if wxUSE_ACCEL
-bool wxMenu::IsEnabled(int id) const
+// 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
{
- wxMenuItem *item = FindItemForId(id);
- wxCHECK_MSG( item != NULL, FALSE, "invalid item id" );
+ size_t count = GetAccelCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ *accels++ = *m_accels[n];
+ }
- return item->IsEnabled();
+ return count;
}
-void wxMenu::Check(int id, bool Flag)
+wxAcceleratorTable *wxMenu::CreateAccelTable() const
{
- wxMenuItem *item = FindItemForId(id);
- wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
+ const size_t count = m_accels.size();
+ wxScopedArray<wxAcceleratorEntry> accels(new wxAcceleratorEntry[count]);
+ CopyAccels(accels.get());
- item->Check(Flag);
+ return new wxAcceleratorTable(count, accels.get());
}
-bool wxMenu::IsChecked(int id) const
+#endif // wxUSE_ACCEL
+
+// ---------------------------------------------------------------------------
+// ownerdrawn helpers
+// ---------------------------------------------------------------------------
+
+#if wxUSE_OWNER_DRAWN
+
+void wxMenu::CalculateMaxAccelWidth()
{
- wxMenuItem *item = FindItemForId(id);
- wxCHECK_MSG( item != NULL, FALSE, "invalid item id" );
+ wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
+
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem* item = node->GetData();
- return item->IsChecked();
+ if ( item->IsOwnerDrawn() )
+ {
+ int width = item->MeasureAccelWidth();
+ if (width > m_maxAccelWidth )
+ m_maxAccelWidth = width;
+ }
+
+ node = node->GetNext();
+ }
}
+#endif // wxUSE_OWNER_DRAWN
+
+// ---------------------------------------------------------------------------
+// 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();
+ 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.wx_str()) ||
+ !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
{
- wxLogLastError("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
+#ifdef __WXWINCE__
+ WinStruct<MENUITEMINFO> info;
+ info.fMask = MIIM_TYPE;
+ info.fType = MFT_STRING;
+ info.cch = m_title.length();
+ info.dwTypeData = const_cast<wxChar *>(m_title.wx_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,
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) )
{
- wxLogLastError("ModifyMenu");
+ wxLogLastError(wxT("ModifyMenu"));
}
+#endif
}
}
-#ifndef __WIN16__
+#ifdef __WIN32__
// put the title string in bold face
- if ( !m_title.IsEmpty() )
+ if ( !m_title.empty() )
{
- 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
+#endif // Win32
}
-const wxString wxMenu::GetTitle() const
-{
- return m_title;
-}
+// ---------------------------------------------------------------------------
+// event processing
+// ---------------------------------------------------------------------------
-void wxMenu::SetLabel(int id, const wxString& label)
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
{
- wxMenuItem *item = FindItemForId(id) ;
- if (item==NULL)
- return;
+ const int id = (signed short)id_;
- if (item->GetSubMenu()==NULL)
+ // ignore commands from the menu title
+ if ( id != idMenuTitle )
{
- HMENU hMenu = GetHMENU();
+ // Default value for uncheckable items.
+ int checked = -1;
- 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)
+ // update the check item when it's clicked
+ wxMenuItem * const item = FindItem(id);
+ if ( item && item->IsCheckable() )
{
- wxMenuItem *matched = (wxMenuItem*)node->Data() ;
- if (matched==item)
- break ;
- i++ ;
- node = node->Next() ;
+ 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;
}
- // 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;
-}
-
-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);
+ SendEvent(id, checked);
}
- return TRUE;
+ return true;
}
-// Finds the item id matching the given string, -1 if not found.
-int wxMenu::FindItem (const wxString& itemString) const
+// get the menu with given handle (recursively)
+#if wxUSE_OWNER_DRAWN
+wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)
{
- // FIXME fixed size buffer
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)itemString, buf1);
+ // check self
+ if ( GetHMenu() == hMenu )
+ return this;
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ // recursively query submenus
+ for ( size_t n = 0 ; n < GetMenuItemCount(); ++n )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
- if (item->GetSubMenu())
- {
- int ans = item->GetSubMenu()->FindItem(itemString);
- if (ans > -1)
- return ans;
- }
- if ( !item->IsSeparator() )
+ wxMenuItem* item = FindItemByPosition(n);
+ wxMenu* submenu = item->GetSubMenu();
+ if ( submenu )
{
- wxStripMenuCodes((char *)item->GetName().c_str(), buf2);
- if (strcmp(buf1, buf2) == 0)
- return item->GetId();
+ submenu = submenu->MSWGetMenu(hMenu);
+ if (submenu)
+ return submenu;
}
}
- return wxNOT_FOUND;
+ // unknown hMenu
+ return NULL;
}
+#endif // wxUSE_OWNER_DRAWN
-wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) 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;
- }
- }
+// ---------------------------------------------------------------------------
+// Menu Bar
+// ---------------------------------------------------------------------------
- if (itemMenu)
- *itemMenu = NULL;
- return NULL;
+void wxMenuBar::Init()
+{
+ m_eventHandler = this;
+ 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
}
-void wxMenu::SetHelpString(int itemId, const wxString& helpString)
+wxMenuBar::wxMenuBar()
{
- wxMenuItem *item = FindItemForId (itemId);
- if (item)
- item->SetHelp(helpString);
- else
- wxFAIL_MSG("wxMenu::SetHelpString: item doesn't exist");
+ Init();
}
-wxString wxMenu::GetHelpString (int itemId) const
+wxMenuBar::wxMenuBar( long WXUNUSED(style) )
{
- 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(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
{
- bool processed = FALSE;
+ Init();
- // Try a callback
- if (m_callback)
+ for ( size_t i = 0; i < count; i++ )
{
- (void)(*(m_callback))(*this, event);
- processed = TRUE;
+ // 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]);
+
+ menus[i]->Attach(this);
}
+}
- // Try the menu's event handler
- if ( !processed && GetEventHandler())
+wxMenuBar::~wxMenuBar()
+{
+ // 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())
{
- processed = GetEventHandler()->ProcessEvent(event);
+ wxToolMenuBar* toolMenuBar = wxDynamicCast(GetToolBar(), wxToolMenuBar);
+ if (toolMenuBar)
+ toolMenuBar->SetMenuBar(NULL);
}
-
- // 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);
+#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
}
-bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
-{
- menu->SetInvokingWindow(this);
- menu->UpdateUI();
+// ---------------------------------------------------------------------------
+// wxMenuBar helpers
+// ---------------------------------------------------------------------------
- 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;
+void wxMenuBar::Refresh()
+{
+ if ( IsFrozen() )
+ return;
- menu->SetInvokingWindow(NULL);
+ wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
- return TRUE;
+#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
}
-// Menu Bar
-wxMenuBar::wxMenuBar()
+WXHMENU wxMenuBar::Create()
{
- m_eventHandler = this;
- m_menuCount = 0;
- m_menus = NULL;
- m_titles = NULL;
- m_menuBarFrame = NULL;
- m_hMenu = 0;
-}
+ // 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;
-wxMenuBar::wxMenuBar( long WXUNUSED(style) )
-{
- m_eventHandler = this;
- m_menuCount = 0;
- m_menus = NULL;
- m_titles = NULL;
- m_menuBarFrame = NULL;
- m_hMenu = 0;
-}
+ wxToolMenuBar * const bar = static_cast<wxToolMenuBar *>(GetToolBar());
+ if ( !bar )
+ return NULL;
-wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[])
-{
- 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;
+ HWND hCommandBar = GetHwndOf(bar);
- m_hMenu = 0;
-}
+ // 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);
-wxMenuBar::~wxMenuBar()
-{
- // 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.
+ 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) label.wx_str();
+
+ tbButton.idCommand = NewControlId();
+ if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) )
+ {
+ wxLogLastError(wxT("TB_INSERTBUTTON"));
+ }
+ }
- // DestroyMenu(menu);
- // m_hMenu = NULL;
+ m_hMenu = bar->GetHMenu();
+ return m_hMenu;
+#else // !__WXWINCE__
+ 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];
+ for ( wxMenuList::iterator it = m_menus.begin();
+ it != m_menus.end();
+ ++it )
+ {
+ if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
+ (UINT_PTR)(*it)->GetHMenu(),
+ (*it)->GetTitle().wx_str()) )
+ {
+ 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 // __WXWINCE__/!__WXWINCE__
}
-// 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(GetHMenuOf(itemMenu), id, MF_BYCOMMAND | flag);
+ int i; // For old C++ compatibility
+ for(i=wxpos; i<totalMSWItems; i++)
+ {
+ if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
+ return i;
+ }
+ for(i=0; i<wxpos; i++)
+ {
+ if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
+ 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( item, "attempt to check an item which doesn't exist" );
- wxCHECK_RET( item->IsCheckable(), "attempt to check an uncheckable item" );
-
- int flag = check ? MF_CHECKED : MF_UNCHECKED;
- CheckMenuItem(GetHMenuOf(itemMenu), id, MF_BYCOMMAND | flag);
-}
+ wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
+ wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
-bool wxMenuBar::IsChecked(int id) const
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-
- wxCHECK_MSG( item, FALSE, "wxMenuItem::IsChecked(): no such item" );
+ int flag = enable ? MF_ENABLED : MF_GRAYED;
- int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND);
+ EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag);
- return (flag & MF_CHECKED) != 0;
+ Refresh();
}
-bool wxMenuBar::IsEnabled(int id) const
+bool wxMenuBar::IsEnabledTop(size_t pos) const
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-
- wxCHECK_MSG( item, FALSE, "wxMenuItem::IsEnabled(): no such item" );
-
- int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND) ;
+ wxCHECK_MSG( pos < GetMenuCount(), false, wxS("invalid menu index") );
+ WinStruct<MENUITEMINFO> mii;
+ mii.fMask = MIIM_STATE;
+ if ( !::GetMenuItemInfo(GetHmenu(), pos, TRUE, &mii) )
+ {
+ wxLogLastError(wxS("GetMenuItemInfo(menubar)"));
+ }
- return (flag & MF_ENABLED) != 0;
+ return !(mii.fState & MFS_GRAYED);
}
-void wxMenuBar::SetLabel(int id, const wxString& label)
+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") );
- if (!item)
- return;
-
- HMENU hMenu = GetHMenuOf(itemMenu);
- UINT was_flag = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
- ::ModifyMenu(hMenu, id, MF_BYCOMMAND | MF_STRING | was_flag, id, label);
-}
+ m_menus[pos]->wxMenuBase::SetTitle(label);
-wxString wxMenuBar::GetLabel(int id) const
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-
- wxCHECK_MSG( item, "", "wxMenuItem::GetLabel(): no such item" );
+ if ( !IsAttached() )
+ {
+ return;
+ }
+ //else: have to modify the existing menu
- HMENU hMenu = GetHMenuOf(itemMenu);
- int len = ::GetMenuString(hMenu, id, NULL, 0, MF_BYCOMMAND);
+ int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
- len++; // for the NUL character
- wxString label;
- ::GetMenuString(hMenu, id, label.GetWriteBuf(len), len, MF_BYCOMMAND);
- label.UngetWriteBuf();
+ UINT_PTR id;
+ UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
+ if ( flagsOld == 0xFFFFFFFF )
+ {
+ wxLogLastError(wxT("GetMenuState"));
- return label;
-}
+ return;
+ }
-void wxMenuBar::SetLabelTop(int pos, const wxString& label)
-{
- UINT id;
- UINT was_flag = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION);
- if (was_flag & MF_POPUP)
+ if ( flagsOld & MF_POPUP )
{
- was_flag &= 0xff ;
- id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos) ;
+ // HIBYTE contains the number of items in the submenu in this case
+ flagsOld &= 0xff;
+ id = (UINT_PTR)::GetSubMenu((HMENU)m_hMenu, mswpos);
}
else
{
id = pos;
}
- ::ModifyMenu((HMENU)m_hMenu, pos, MF_BYPOSITION | MF_STRING | was_flag,
- id, label) ;
+#ifdef __WXWINCE__
+ WinStruct<MENUITEMINFO> info;
+ info.fMask = MIIM_TYPE;
+ info.fType = MFT_STRING;
+ info.cch = label.length();
+ info.dwTypeData = const_cast<wxChar *>(label.wx_str());
+ if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) )
+ {
+ wxLogLastError(wxT("SetMenuItemInfo"));
+ }
+
+#else
+ if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
+ id, label.wx_str()) == (int)0xFFFFFFFF )
+ {
+ 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((HMENU)m_hMenu, 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();
}
-bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
+// ---------------------------------------------------------------------------
+// wxMenuBar construction
+// ---------------------------------------------------------------------------
+
+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;
- 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;
+ menu->wxMenuBase::SetTitle(title);
- if (m_menuBarFrame) {
- DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ;
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ if (IsAttached())
+#else
+ if (GetHmenu())
+#endif
+ {
+ int mswpos = MSWPositionForWxMenu(menuOld,pos);
+
+ // can't use ModifyMenu() because it deletes the submenu it replaces
+ if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) )
+ {
+ wxLogLastError(wxT("RemoveMenu"));
+ }
+
+ if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
+ MF_BYPOSITION | MF_POPUP | MF_STRING,
+ (UINT_PTR)GetHmenuOf(menu), title.wx_str()) )
+ {
+ wxLogLastError(wxT("InsertMenu"));
}
- return TRUE;
+#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 char *title)
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
{
- if (!a_menu->m_hMenu)
- 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->m_savehMenu = a_menu->m_hMenu;
- a_menu->m_hMenu = 0;
+ if ( !wxMenuBarBase::Insert(pos, menu, title) )
+ return false;
- AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)a_menu->m_savehMenu, title);
+ menu->wxMenuBase::SetTitle(title);
+
+ if ( isAttached )
+ {
+#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) label.wx_str();
+
+ 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.wx_str()) )
+ {
+ wxLogLastError(wxT("InsertMenu"));
+ }
+#endif
+#if wxUSE_ACCEL
+ if ( menu->HasAccels() )
+ {
+ // need to rebuild accell table
+ RebuildAccelTable();
+ }
+#endif // wxUSE_ACCEL
- DrawMenuBar((HWND)m_menuBarFrame->GetHWND());
+ if (IsAttached())
+ Refresh();
+ }
- return TRUE;
+ 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)
+ 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) label.wx_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_PTR)submenu, title.wx_str()) )
+ {
+ wxLogLastError(wxT("AppendMenu"));
+ }
+#endif
- m_menus[m_menuCount - 1] = (wxMenu *)menu;
- m_titles[m_menuCount - 1] = title;
+#if wxUSE_ACCEL
+ if ( menu->HasAccels() )
+ {
+ // need to rebuild accelerator table
+ RebuildAccelTable();
+ }
+#endif // wxUSE_ACCEL
+
+ if (IsAttached())
+ 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;
-
- 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();
}
-}
-// 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;
+ return menu;
}
-wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const
-{
- if (itemMenu)
- *itemMenu = NULL;
+#if wxUSE_ACCEL
- wxMenuItem *item = NULL;
- int i;
- for (i = 0; i < m_menuCount; i++)
+void wxMenuBar::RebuildAccelTable()
+{
+ // 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]);
}
+
+ SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries));
+
+ delete [] accelEntries;
}
}
-wxString wxMenuBar::GetHelpString (int id) const
-{
- wxString helpString;
+#endif // wxUSE_ACCEL
- for (int i = 0; i < m_menuCount; i++)
+void wxMenuBar::Attach(wxFrame *frame)
+{
+ 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)
{
- wxMenuItem *item = m_menus[i]->FindItemForId(id);
- if ( item )
+ if (m_hMenu)
{
- helpString = item->GetHelp();
-
- break;
+ if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0))
+ {
+ wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
+ }
}
}
+#endif
- return helpString;
+#if wxUSE_ACCEL
+ RebuildAccelTable();
+#endif // wxUSE_ACCEL
}
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-wxWindow *wxMenu::GetWindow() const
+#if defined(WINCE_WITH_COMMANDBAR)
+bool wxMenuBar::AddAdornments(long style)
{
- if ( m_pInvokingWindow != NULL )
- return m_pInvokingWindow;
- else if ( m_menuBar != NULL)
- return m_menuBar->m_menuBarFrame;
+ if (m_adornmentsAdded || !m_commandBar)
+ return false;
- return NULL;
+ if (style & wxCLOSE_BOX)
+ {
+ if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))
+ {
+ wxLogLastError(wxT("CommandBar_AddAdornments"));
+ }
+ else
+ {
+ return true;
+ }
+ }
+ return false;
}
+#endif
-WXHMENU wxMenu::GetHMenu() const
+void wxMenuBar::Detach()
{
- if ( m_hMenu != 0 )
- return m_hMenu;
- else if ( m_savehMenu != 0 )
- return m_savehMenu;
-
- wxFAIL_MSG("wxMenu without HMENU");
-
- return 0;
+ wxMenuBarBase::Detach();
}
-// Update a menu and all submenus recursively. source is the object that has
-// the update event handlers defined for it. If NULL, the menu or associated
-// window will be used.
-void wxMenu::UpdateUI(wxEvtHandler* source)
+// get the menu with given handle (recursively)
+wxMenu* wxMenuBar::MSWGetMenu(WXHMENU hMenu)
{
- if (!source && GetInvokingWindow())
- source = GetInvokingWindow()->GetEventHandler();
- if (!source)
- source = GetEventHandler();
- if (!source)
- source = this;
+ wxCHECK_MSG( GetHMenu() != hMenu, NULL,
+ wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") );
- 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
projects / wxWidgets.git / blobdiff