/////////////////////////////////////////////////////////////////////////////
-// 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"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#include "wx/frame.h"
+#if wxUSE_MENUS
+
#include "wx/menu.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/frame.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"
+ #include "wx/ownerdrw.h"
#endif
+#include "wx/scopedarray.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
+// ----------------------------------------------------------------------------
+
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// the (popup) menu title has this special id
-static const int idMenuTitle = -2;
+static const int idMenuTitle = wxID_NONE;
// ----------------------------------------------------------------------------
-// wxWindows macros
+// private functions
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
- IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// Menus
-// Construct a menu with optional title (then use append)
-wxMenu::wxMenu(const wxString& Title, const wxFunction func)
+namespace
{
- m_title = Title;
- m_parent = NULL;
- m_eventHandler = this;
- m_pInvokingWindow = NULL;
- m_doBreak = FALSE ;
- m_noItems = 0;
- m_menuBar = NULL;
- m_hMenu = (WXHMENU) CreatePopupMenu();
- m_savehMenu = 0 ;
- m_topLevelMenu = this;
- m_clientData = (void*) NULL;
-
- if (m_title != "")
- {
- Append(idMenuTitle, m_title) ;
- AppendSeparator() ;
- }
- Callback(func);
+// make the given menu item default
+void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
+ UINT WXUNUSED_IN_WINCE(id))
+{
+#ifndef __WXWINCE__
+ MENUITEMINFO mii;
+ wxZeroMemory(mii);
+ mii.cbSize = sizeof(MENUITEMINFO);
+ mii.fMask = MIIM_STATE;
+ mii.fState = MFS_DEFAULT;
+
+ if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) )
+ {
+ wxLogLastError(wxT("SetMenuItemInfo"));
+ }
+#endif // !__WXWINCE__
}
-// The wxWindow destructor will take care of deleting the submenus.
-wxMenu::~wxMenu()
+// 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))
{
- if (m_hMenu)
- DestroyMenu((HMENU) m_hMenu);
- m_hMenu = 0;
-
- // Windows seems really bad on Menu de-allocation...
- // After many try, here is what I do: RemoveMenu() will ensure
- // that popup are "disconnected" from their parent; then call
- // delete method on each child (which in turn do a recursive job),
- // and finally, DestroyMenu()
- //
- // With that, BoundCheckers is happy, and no complaints...
-/*
- int N = 0 ;
- if (m_hMenu)
- N = GetMenuItemCount(m_hMenu);
- int i;
- for (i = N-1; i >= 0; i--)
- RemoveMenu(m_hMenu, i, MF_BYPOSITION);
-*/
-
- // How is deleting submenus in this loop any different from deleting
- // the submenus in the children list, via ~wxWindow ?
- // I'll reinstate this deletion for now and remove addition
- // from children list (which doesn't exist now)
- // Julian 1/3/97
- wxNode *node = m_menuItems.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem *)node->Data();
-
- // Delete child menus.
- // Beware: they must not be appended to children list!!!
- // (because order of delete is significant)
- if (item->GetSubMenu())
- item->DeleteSubMenu();
-
- wxNode *next = node->Next();
- delete item;
- delete node;
- node = next;
- }
-/*
- if (m_hMenu)
- DestroyMenu(m_hMenu);
- m_hMenu = 0;
-*/
+#ifndef __WXWINCE__
+ MENUITEMINFO mii;
+ wxZeroMemory(mii);
+ mii.cbSize = sizeof(MENUITEMINFO);
+ 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__
}
-void wxMenu::Break()
+#ifdef __WXWINCE__
+UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
{
- m_doBreak = TRUE ;
+ MENUITEMINFO info;
+ wxZeroMemory(info);
+ info.cbSize = sizeof(info);
+ info.fMask = MIIM_STATE;
+ // MF_BYCOMMAND is zero so test MF_BYPOSITION
+ if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) )
+ {
+ wxLogLastError(wxT("GetMenuItemInfo"));
+ }
+ return info.fState;
}
+#endif // __WXWINCE__
-// function appends a new item or submenu to the menu
-void wxMenu::Append(wxMenuItem *pItem)
+inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
{
- wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
+ return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
+ bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
+}
- m_menuItems.Append(pItem);
+} // anonymous namespace
- UINT flags = 0;
-
- if ( m_doBreak ) {
- flags |= MF_MENUBREAK;
- m_doBreak = FALSE;
- }
+// ============================================================================
+// implementation
+// ============================================================================
- if ( pItem->IsSeparator() ) {
- flags |= MF_SEPARATOR;
- }
+#include "wx/listimpl.cpp"
- // 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 );
+WX_DEFINE_LIST( wxMenuInfoList )
- id = (UINT)SubMenu->m_hMenu;
+#if wxUSE_EXTENDED_RTTI
- SubMenu->m_topLevelMenu = m_topLevelMenu;
- SubMenu->m_parent = this;
- SubMenu->m_savehMenu = (WXHMENU)id;
- SubMenu->m_hMenu = 0;
+WX_DEFINE_FLAGS( wxMenuStyle )
- flags |= MF_POPUP;
- }
- else {
- id = pItem->GetId();
- }
+wxBEGIN_FLAGS( wxMenuStyle )
+ wxFLAGS_MEMBER(wxMENU_TEAROFF)
+wxEND_FLAGS( wxMenuStyle )
- LPCSTR pData;
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler,"wx/menu.h")
-#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;
- }
- else
-#endif
- {
- // menu is just a normal string (passed in data parameter)
- flags |= MF_STRING;
- pData = pItem->GetName();
- }
+wxCOLLECTION_TYPE_INFO( wxMenuItem * , wxMenuItemList ) ;
- // visually select the menu title
- if ( id == idMenuTitle )
- {
- // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face
- }
+template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVariantArray &value)
+{
+ wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList , value ) ;
+}
- HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu);
- if ( !AppendMenu(hMenu, flags, id, pData) )
- {
- wxLogLastError("AppendMenu");
- }
+wxBEGIN_PROPERTIES_TABLE(wxMenu)
+ wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
+ wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+ wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
- m_noItems++;
-}
+wxBEGIN_HANDLERS_TABLE(wxMenu)
+wxEND_HANDLERS_TABLE()
-void wxMenu::AppendSeparator()
+wxDIRECT_CONSTRUCTOR_2( wxMenu , wxString , Title , long , MenuStyle )
+
+WX_DEFINE_FLAGS( wxMenuBarStyle )
+
+wxBEGIN_FLAGS( wxMenuBarStyle )
+ wxFLAGS_MEMBER(wxMB_DOCKABLE)
+wxEND_FLAGS( wxMenuBarStyle )
+
+// the negative id would lead the window (its superclass !) to vetoe streaming out otherwise
+bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxWriter * , wxPersister * , wxxVariantArray & )
{
- Append(new wxMenuItem(this, ID_SEPARATOR));
+ return true ;
}
-// Pullright item
-void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu,
- const wxString& helpString)
+IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarStreamingCallback)
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject , "wx/menu.h" )
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuInfo)
+ wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxREADONLY_PROPERTY( Title , wxString , GetTitle , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenuInfo)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title )
+
+wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ;
+
+template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, wxxVariantArray &value)
{
- Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu));
+ wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList , value ) ;
}
-// Ordinary menu item
-void wxMenu::Append(int Id, const wxString& label,
- const wxString& helpString, bool checkable)
+wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
+ wxPROPERTY_COLLECTION( MenuInfos , wxMenuInfoList , wxMenuInfo* , Append , GetMenuInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenuBar)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_DUMMY( wxMenuBar )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
+#endif
+
+const wxMenuInfoList& wxMenuBar::GetMenuInfos() const
{
- // 'checkable' parameter is useless for Windows.
- Append(new wxMenuItem(this, Id, label, helpString, checkable));
+ wxMenuInfoList* list = const_cast< wxMenuInfoList* >( &m_menuInfos ) ;
+ WX_CLEAR_LIST( wxMenuInfoList , *list ) ;
+ for( size_t i = 0 ; i < GetMenuCount() ; ++i )
+ {
+ wxMenuInfo* info = new wxMenuInfo() ;
+ info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetMenuLabel(i) ) ;
+ list->Append( info ) ;
+ }
+ return m_menuInfos ;
}
-void wxMenu::Delete(int id)
+// ---------------------------------------------------------------------------
+// wxMenu construction, adding and removing menu items
+// ---------------------------------------------------------------------------
+
+// Construct a menu with optional title (then use append)
+void wxMenu::Init()
{
- wxNode *node;
- int pos;
- HMENU menu;
+ m_doBreak = false;
+ m_startRadioGroup = -1;
- wxMenuItem *item = NULL;
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) {
- item = (wxMenuItem *)node->Data();
- if (item->GetId() == id)
- break;
- }
+#if wxUSE_OWNER_DRAWN
+ m_ownerDrawn = false;
+ m_maxBitmapWidth = 0;
+ m_maxAccelWidth = -1;
+#endif // wxUSE_OWNER_DRAWN
+
+ // create the menu
+ m_hMenu = (WXHMENU)CreatePopupMenu();
+ if ( !m_hMenu )
+ {
+ wxLogLastError(wxT("CreatePopupMenu"));
+ }
- if (!node)
- return;
+ // 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);
+ }
+}
- menu = (HMENU)(m_hMenu ? m_hMenu : m_savehMenu);
+// 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() )
+ {
+ if ( !::DestroyMenu(GetHmenu()) )
+ {
+ wxLogLastError(wxT("DestroyMenu"));
+ }
+ }
- wxMenu *pSubMenu = item->GetSubMenu();
- if ( pSubMenu != NULL ) {
- RemoveMenu(menu, (UINT)pos, MF_BYPOSITION);
- pSubMenu->m_hMenu = pSubMenu->m_savehMenu;
- pSubMenu->m_savehMenu = 0;
- pSubMenu->m_parent = NULL;
- // RemoveChild(item->subMenu);
- pSubMenu->m_topLevelMenu = NULL;
- // TODO: Why isn't subMenu deleted here???
- // Will put this in for now. Assuming this is supposed
- // to delete the menu, not just remove it.
- item->DeleteSubMenu();
- }
- else {
- DeleteMenu(menu, (UINT)pos, MF_BYPOSITION);
- }
+#if wxUSE_ACCEL
+ // delete accels
+ WX_CLEAR_ARRAY(m_accels);
+#endif // wxUSE_ACCEL
+}
- m_menuItems.DeleteNode(node);
- delete item;
+void wxMenu::Break()
+{
+ // this will take effect during the next call to Append()
+ m_doBreak = true;
}
-void wxMenu::Enable(int Id, bool Flag)
+void wxMenu::Attach(wxMenuBarBase *menubar)
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );
+ wxMenuBase::Attach(menubar);
- item->Enable(Flag);
+ EndRadioGroup();
}
-bool wxMenu::Enabled(int Id) const
+#if wxUSE_ACCEL
+
+int wxMenu::FindAccel(int id) const
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK( item != NULL, FALSE );
+ size_t n, count = m_accels.GetCount();
+ for ( n = 0; n < count; n++ )
+ {
+ if ( m_accels[n]->m_command == id )
+ return n;
+ }
- return item->IsEnabled();
+ return wxNOT_FOUND;
}
-void wxMenu::Check(int Id, bool Flag)
+void wxMenu::UpdateAccel(wxMenuItem *item)
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
-
- item->Check(Flag);
+ 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 ( IsAttached() )
+ {
+ GetMenuBar()->RebuildAccelTable();
+ }
+
+ ResetMaxAccelWidth();
+ }
+ //else: it is a separator, they can't have accels, nothing to do
}
-bool wxMenu::Checked(int Id) const
+#endif // wxUSE_ACCEL
+
+namespace
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK( item != NULL, FALSE );
- return item->IsChecked();
+// 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 )
+ {
+ 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));
+ }
+ //else: bitmap is not set
+
+ return NULL;
+ }
+#endif // wxUSE_IMAGE
+
+ return HBMMENU_CALLBACK;
}
-void wxMenu::SetTitle(const wxString& label)
+} // anonymous namespace
+
+// append a new item or submenu to the menu
+bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
{
- bool hasNoTitle = m_title.IsEmpty();
- m_title = label;
+#if wxUSE_ACCEL
+ UpdateAccel(pItem);
+#endif // wxUSE_ACCEL
+
+ // 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;
+ }
+
+ if ( pItem->IsSeparator() ) {
+ flags |= MF_SEPARATOR;
+ }
+
+ // 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") );
- HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu);
+ submenu->SetParent(this);
+
+ id = (UINT_PTR)submenu->GetHMenu();
+
+ flags |= MF_POPUP;
+ }
+ else {
+ id = pItem->GetMSWId();
+ }
- if ( hasNoTitle )
- {
- if ( !label.IsEmpty() )
+
+ // prepare to insert the item in the menu
+ wxString itemText = pItem->GetItemLabel();
+ LPCTSTR pData = NULL;
+ if ( pos == (size_t)-1 )
{
- if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
- (unsigned)idMenuTitle, m_title) ||
- !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
- {
- wxLogLastError("InsertMenu");
- }
+ // append at the end (note that the item is already appended to
+ // internal data structures)
+ pos = GetMenuItemCount() - 1;
}
- }
- else
- {
- if ( label.IsEmpty() )
+
+ // adjust position to account for the title, if any
+ if ( !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() )
{
- // remove the title and the separator after it
- if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
- !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
- {
- wxLogLastError("RemoveMenu");
- }
+#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().Ok() ||
+ pItem->GetBackgroundColour().Ok() ||
+ pItem->GetFont().Ok();
+
+ if ( !mustUseOwnerDrawn )
+ {
+ const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
+ bmpChecked = pItem->GetBitmap(true);
+
+ if ( (bmpUnchecked.Ok() && IsGreaterThanStdSize(bmpUnchecked)) ||
+ (bmpChecked.Ok() && 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 // wxUSE_OWNER_DRAWN
+ {
+ // item is just a normal string (passed in data parameter)
+ flags |= MF_STRING;
+
+#ifdef __WXWINCE__
+ itemText = wxMenuItem::GetLabelText(itemText);
+#endif
+
+ pData = (wxChar*)itemText.wx_str();
+ }
+
+ // 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;
+ }
+ }
+
+
+ // if we just appended the title, highlight it
+ if ( id == (UINT_PTR)idMenuTitle )
{
- // modify the title
- if ( !ModifyMenu(hMenu, 0u,
- MF_BYPOSITION | MF_STRING,
- (unsigned)idMenuTitle, m_title) )
- {
- wxLogLastError("ModifyMenu");
- }
+ // visually select the menu title
+ SetDefaultMenuItem(GetHmenu(), id);
}
- }
- // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face
+ // if we're already attached to the menubar, we must update it
+ if ( IsAttached() && GetMenuBar()->IsAttached() )
+ {
+ GetMenuBar()->Refresh();
+ }
+
+ return true;
}
-const wxString wxMenu::GetTitle() const
+void wxMenu::EndRadioGroup()
{
- return m_title;
+ // we're not inside a radio group any longer
+ m_startRadioGroup = -1;
}
-void wxMenu::SetLabel(int Id, const wxString& label)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
{
- wxMenuItem *item = FindItemForId(Id) ;
- if (item==NULL)
- return;
+ wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") );
+
+ bool check = false;
- if (item->GetSubMenu()==NULL)
- {
- if (m_hMenu)
+ if ( item->GetKind() == wxITEM_RADIO )
{
- UINT was_flag = GetMenuState((HMENU)m_hMenu,Id,MF_BYCOMMAND) ;
- ModifyMenu((HMENU)m_hMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ;
+ int count = GetMenuItemCount();
+
+ if ( m_startRadioGroup == -1 )
+ {
+ // start a new radio group
+ m_startRadioGroup = count;
+
+ // for now it has just one element
+ item->SetAsRadioGroupStart();
+ item->SetRadioGroupEnd(m_startRadioGroup);
+
+ // ensure that we have a checked item in the radio group
+ check = true;
+ }
+ else // extend the current radio group
+ {
+ // we need to update its end item
+ item->SetRadioGroupStart(m_startRadioGroup);
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
+
+ if ( node )
+ {
+ node->GetData()->SetRadioGroupEnd(count);
+ }
+ else
+ {
+ wxFAIL_MSG( wxT("where is the radio group start item?") );
+ }
+ }
}
- else if (m_savehMenu)
+ else // not a radio item
{
- UINT was_flag = GetMenuState((HMENU)m_savehMenu,Id,MF_BYCOMMAND) ;
- ModifyMenu((HMENU)m_savehMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ;
+ EndRadioGroup();
}
- }
- else
- {
- wxMenu *father = item->GetSubMenu()->m_topLevelMenu ;
- wxNode *node = father->m_menuItems.First() ;
- int i = 0 ;
- while (node)
+
+ if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
{
- wxMenuItem *matched = (wxMenuItem*)node->Data() ;
- if (matched==item)
- break ;
- i++ ;
- node = node->Next() ;
- }
- // Here, we have the position.
- ModifyMenu((HMENU)father->m_savehMenu,i,
- MF_BYPOSITION|MF_STRING|MF_POPUP,
- (UINT)item->GetSubMenu()->m_savehMenu,(const char *)label) ;
- }
- item->SetName(label);
-}
-
-wxString wxMenu::GetLabel(int id) const
-{
-/*
- static char tmp[128] ;
- int len;
- if (m_hMenu)
- len = GetMenuString((HMENU)m_hMenu,Id,tmp,WXSIZEOF(tmp) - 1,MF_BYCOMMAND);
- else if (m_savehMenu)
- len = GetMenuString((HMENU)m_savehMenu,Id,tmp,WXSIZEOF(tmp) - 1,MF_BYCOMMAND);
- else
- len = 0 ;
- tmp[len] = '\0' ;
- return wxString(tmp) ;
-
-*/
- wxMenuItem *pItem = FindItemForId(id) ;
- if (pItem)
- return pItem->GetName() ;
- else
- return wxEmptyString;
+ return NULL;
+ }
+
+ if ( check )
+ {
+ // check the item initially
+ item->Check(true);
+ }
+
+ return item;
}
-bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
- event.SetEventObject( this );
- event.SetId( id );
- event.SetInt( id );
- ProcessCommand(event);
- return TRUE;
+ if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos))
+ return item;
+ else
+ return NULL;
}
-// Finds the item id matching the given string, -1 if not found.
-int wxMenu::FindItem (const wxString& itemString) const
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)itemString, buf1);
-
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ // 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++ )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
- if (item->GetSubMenu())
- {
- int ans = item->GetSubMenu()->FindItem(itemString);
- if (ans > -1)
- return ans;
- }
- if ( !item->IsSeparator() )
- {
- wxStripMenuCodes((char *)item->GetName().c_str(), buf2);
- if (strcmp(buf1, buf2) == 0)
- return item->GetId();
- }
+ if ( node->GetData() == item )
+ break;
+
+ node = node->GetNext();
}
- return -1;
-}
+ // DoRemove() (unlike Remove) can only be called for an existing item!
+ wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
-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 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);
+
+ ResetMaxAccelWidth();
+ }
+ //else: this item doesn't have an accel, nothing to do
+#endif // wxUSE_ACCEL
- if (item->GetId() == itemId)
+ // remove the item from the menu
+ if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
- if (itemMenu)
- *itemMenu = (wxMenu *) this;
- return item;
+ wxLogLastError(wxT("RemoveMenu"));
}
- if (item->GetSubMenu())
+ if ( IsAttached() && GetMenuBar()->IsAttached() )
{
- wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
- if (ans)
- return ans;
+ // otherwise, the change won't be visible
+ GetMenuBar()->Refresh();
}
- }
- if (itemMenu)
- *itemMenu = NULL;
- return NULL;
+ // and from internal data structures
+ return wxMenuBase::DoRemove(item);
}
-void wxMenu::SetHelpString(int itemId, const wxString& helpString)
+// ---------------------------------------------------------------------------
+// accelerator helpers
+// ---------------------------------------------------------------------------
+
+#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
{
- wxMenuItem *item = FindItemForId (itemId);
- if (item)
- item->SetHelp(helpString);
+ size_t count = GetAccelCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ *accels++ = *m_accels[n];
+ }
+
+ return count;
}
-wxString wxMenu::GetHelpString (int itemId) const
+wxAcceleratorTable *wxMenu::CreateAccelTable() const
{
- wxMenuItem *item = FindItemForId (itemId);
- wxString str("");
- return (item == NULL) ? str : item->GetHelp();
+ const size_t count = m_accels.size();
+ wxScopedArray<wxAcceleratorEntry> accels(new wxAcceleratorEntry[count]);
+ CopyAccels(accels.get());
+
+ return new wxAcceleratorTable(count, accels.get());
}
-void wxMenu::ProcessCommand(wxCommandEvent & event)
+#endif // wxUSE_ACCEL
+
+// ---------------------------------------------------------------------------
+// ownerdrawn helpers
+// ---------------------------------------------------------------------------
+
+#if wxUSE_OWNER_DRAWN
+
+void wxMenu::CalculateMaxAccelWidth()
{
- bool processed = FALSE;
+ wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
- // Try a callback
- if (m_callback)
- {
- (void)(*(m_callback))(*this, event);
- processed = TRUE;
- }
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem* item = node->GetData();
- // Try the menu's event handler
- if ( !processed && GetEventHandler())
- {
- processed = GetEventHandler()->ProcessEvent(event);
- }
+ if ( item->IsOwnerDrawn() )
+ {
+ int width = item->MeasureAccelWidth();
+ if (width > m_maxAccelWidth )
+ m_maxAccelWidth = width;
+ }
- // Try the window the menu was popped up from (and up
- // through the hierarchy)
- if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
+ node = node->GetNext();
+ }
}
-extern wxMenu *wxCurrentPopupMenu;
-bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
+#endif // wxUSE_OWNER_DRAWN
+
+// ---------------------------------------------------------------------------
+// set wxMenu title
+// ---------------------------------------------------------------------------
+
+void wxMenu::SetTitle(const wxString& label)
{
- menu->SetInvokingWindow(this);
+ bool hasNoTitle = m_title.empty();
+ m_title = label;
- 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;
+ HMENU hMenu = GetHmenu();
- menu->SetInvokingWindow(NULL);
+ if ( hasNoTitle )
+ {
+ if ( !label.empty() )
+ {
+ if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) ||
+ !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
+ {
+ wxLogLastError(wxT("InsertMenu"));
+ }
+ }
+ }
+ else
+ {
+ if ( label.empty() )
+ {
+ // remove the title and the separator after it
+ if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
+ !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
+ {
+ wxLogLastError(wxT("RemoveMenu"));
+ }
+ }
+ else
+ {
+ // modify the title
+#ifdef __WXWINCE__
+ MENUITEMINFO info;
+ wxZeroMemory(info);
+ info.cbSize = sizeof(info);
+ info.fMask = MIIM_TYPE;
+ info.fType = MFT_STRING;
+ info.cch = m_title.length();
+ info.dwTypeData = 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,
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) )
+ {
+ wxLogLastError(wxT("ModifyMenu"));
+ }
+#endif
+ }
+ }
- return TRUE;
+#ifdef __WIN32__
+ // put the title string in bold face
+ if ( !m_title.empty() )
+ {
+ SetDefaultMenuItem(GetHmenu(), (UINT_PTR)idMenuTitle);
+ }
+#endif // Win32
}
-// Menu Bar
-wxMenuBar::wxMenuBar()
+// ---------------------------------------------------------------------------
+// event processing
+// ---------------------------------------------------------------------------
+
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
{
- m_eventHandler = this;
+ const int id = (signed short)id_;
- m_menuCount = 0;
- m_menus = NULL;
- m_titles = NULL;
- m_menuBarFrame = NULL;
- m_hMenu = 0;
+ // ignore commands from the menu title
+ if ( id != idMenuTitle )
+ {
+ // update the check item when it's clicked
+ wxMenuItem * const item = FindItem(id);
+ if ( item && item->IsCheckable() )
+ 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
+ UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND);
+ SendEvent(id, menuState & MF_CHECKED);
+ }
+
+ return true;
}
-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;
+// ---------------------------------------------------------------------------
+// Menu Bar
+// ---------------------------------------------------------------------------
- m_hMenu = 0;
+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
}
-wxMenuBar::~wxMenuBar()
+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.
-
-// DestroyMenu(menu);
-// m_hMenu = NULL;
-
- int i;
-/*
- // See remarks in ::~wxMenu() method
- // BEWARE - this may interfere with MDI fixes, so
- // may need to remove
- int N = 0 ;
-
- if (m_menuBarFrame && ((m_menuBarFrame->GetWindowStyleFlag() & wxSDI) == wxSDI))
- {
- if (menu)
- N = GetMenuItemCount(menu) ;
- for (i = N-1; i >= 0; i--)
- RemoveMenu(menu, i, MF_BYPOSITION);
- }
-*/
- for (i = 0; i < m_menuCount; i++)
- {
- delete m_menus[i];
- }
- delete[] m_menus;
- delete[] m_titles;
+ Init();
+}
-/* 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;
-*/
-}
+wxMenuBar::wxMenuBar( long WXUNUSED(style) )
+{
+ Init();
+}
-// 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 Flag)
+wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
{
- int ms_flag;
- if (Flag)
- ms_flag = MF_ENABLED;
- else
- ms_flag = MF_GRAYED;
+ Init();
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
- if (!item)
- return;
+ m_titles.Alloc(count);
- if (itemMenu->m_hMenu)
- EnableMenuItem((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND | ms_flag);
- else if (itemMenu->m_savehMenu)
- EnableMenuItem((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND | ms_flag);
+ for ( size_t i = 0; i < count; i++ )
+ {
+ m_menus.Append(menus[i]);
+ m_titles.Add(titles[i]);
+ menus[i]->Attach(this);
+ }
}
-void wxMenuBar::EnableTop(int pos, bool flag)
+wxMenuBar::~wxMenuBar()
{
- int ms_flag;
- if (flag)
- ms_flag = MF_ENABLED;
- else
- ms_flag = MF_GRAYED;
-
- EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | ms_flag);
- DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ;
+ // 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())
+ {
+ wxToolMenuBar* toolMenuBar = wxDynamicCast(GetToolBar(), wxToolMenuBar);
+ if (toolMenuBar)
+ toolMenuBar->SetMenuBar(NULL);
+ }
+#else
+ // we should free Windows resources only if Windows doesn't do it for us
+ // which happens if we're attached to a frame
+ if (m_hMenu && !IsAttached())
+ {
+#if defined(WINCE_WITH_COMMANDBAR)
+ ::DestroyWindow((HWND) m_commandBar);
+ m_commandBar = (WXHWND) NULL;
+#else
+ ::DestroyMenu((HMENU)m_hMenu);
+#endif
+ m_hMenu = (WXHMENU)NULL;
+ }
+#endif
}
-// Must only be used AFTER menu has been attached to frame,
-// otherwise use individual menus
-void wxMenuBar::Check(int Id, bool Flag)
+// ---------------------------------------------------------------------------
+// wxMenuBar helpers
+// ---------------------------------------------------------------------------
+
+void wxMenuBar::Refresh()
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
- if (!item)
- return;
-
- if (!item->IsCheckable())
- return ;
- int ms_flag;
- if (Flag)
- ms_flag = MF_CHECKED;
- else
- ms_flag = MF_UNCHECKED;
+ if ( IsFrozen() )
+ return;
- if (itemMenu->m_hMenu)
- CheckMenuItem((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND | ms_flag);
- else if (itemMenu->m_savehMenu)
- CheckMenuItem((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND | ms_flag);
+ wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
-// CheckMenuItem((HMENU)m_hMenu, Id, MF_BYCOMMAND | ms_flag);
+#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
}
-bool wxMenuBar::Checked(int Id) const
+WXHMENU wxMenuBar::Create()
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
- if (!item)
- return FALSE;
+ // 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<wxToolMenuBar *>(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) label.wx_str();
+
+ tbButton.idCommand = NewControlId();
+ if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) )
+ {
+ wxLogLastError(wxT("TB_INSERTBUTTON"));
+ }
+ }
- int Flag = 0;
+ m_hMenu = bar->GetHMenu();
+ return m_hMenu;
+#else // !__WXWINCE__
+ if ( m_hMenu != 0 )
+ return m_hMenu;
- if (itemMenu->m_hMenu)
- Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ;
- else if (itemMenu->m_savehMenu)
- Flag=GetMenuState((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND) ;
+ m_hMenu = (WXHMENU)::CreateMenu();
-// Flag=GetMenuState((HMENU)m_hMenu, Id, MF_BYCOMMAND) ;
+ if ( !m_hMenu )
+ {
+ wxLogLastError(wxT("CreateMenu"));
+ }
+ else
+ {
+ size_t count = GetMenuCount(), i;
+ wxMenuList::iterator it;
+ for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
+ {
+ if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
+ (UINT_PTR)(*it)->GetHMenu(),
+ m_titles[i].wx_str()) )
+ {
+ wxLogLastError(wxT("AppendMenu"));
+ }
+ }
+ }
- if (Flag&MF_CHECKED)
- return TRUE ;
- else
- return FALSE ;
+ return m_hMenu;
+#endif // __WXWINCE__/!__WXWINCE__
}
-bool wxMenuBar::Enabled(int Id) const
+int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
- if (!item)
- return FALSE;
-
- int Flag ;
-
- if (itemMenu->m_hMenu)
- Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ;
- else if (itemMenu->m_savehMenu)
- Flag=GetMenuState((HMENU)itemMenu->m_savehMenu, 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
- if (Flag&MF_ENABLED)
- return TRUE ;
- else
- return FALSE ;
+ 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;
}
+// ---------------------------------------------------------------------------
+// wxMenuBar functions to work with the top level submenus
+// ---------------------------------------------------------------------------
+
+// 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( IsAttached(), wxT("doesn't work with unattached menubars") );
+ wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
- if (!item)
- return;
+ int flag = enable ? MF_ENABLED : MF_GRAYED;
- if (itemMenu->m_hMenu)
- {
- UINT was_flag = GetMenuState((HMENU)itemMenu->m_hMenu,Id,MF_BYCOMMAND) ;
- ModifyMenu((HMENU)itemMenu->m_hMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ;
- }
- else if (itemMenu->m_savehMenu)
- {
- UINT was_flag = GetMenuState((HMENU)itemMenu->m_savehMenu,Id,MF_BYCOMMAND) ;
- ModifyMenu((HMENU)itemMenu->m_savehMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ;
- }
+ EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag);
+
+ Refresh();
}
-wxString wxMenuBar::GetLabel(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") );
- if (!item)
- return wxString("");
+ m_titles[pos] = label;
- static char tmp[128] ;
- int len = 0;
- if (itemMenu->m_hMenu)
- {
- len = GetMenuString((HMENU)itemMenu->m_hMenu,Id,tmp,127,MF_BYCOMMAND) ;
- }
- else if (itemMenu->m_savehMenu)
- {
- len = GetMenuString((HMENU)itemMenu->m_savehMenu,Id,tmp,127,MF_BYCOMMAND) ;
- }
+ if ( !IsAttached() )
+ {
+ return;
+ }
+ //else: have to modify the existing menu
-// int len = GetMenuString((HMENU)m_hMenu,Id,tmp,127,MF_BYCOMMAND) ;
- tmp[len] = '\0' ;
- return wxString(tmp) ;
-}
+ int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
-void wxMenuBar::SetLabelTop(int pos, const wxString& label)
-{
- UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ;
- if (was_flag&MF_POPUP)
- {
- was_flag &= 0xff ;
- HMENU popup = GetSubMenu((HMENU)m_hMenu,pos) ;
- ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,(UINT)popup,(const char *)label) ;
- }
- else
- ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ;
+ UINT_PTR id;
+ UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
+ if ( flagsOld == 0xFFFFFFFF )
+ {
+ wxLogLastError(wxT("GetMenuState"));
+
+ return;
+ }
+
+ if ( flagsOld & MF_POPUP )
+ {
+ // 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;
+ }
+
+#ifdef __WXWINCE__
+ MENUITEMINFO info;
+ wxZeroMemory(info);
+ info.cbSize = sizeof(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
{
- static char tmp[128] ;
- int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ;
- tmp[len] = '\0' ;
- return wxString(tmp);
+ wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
+ wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
+
+ return m_titles[pos];
}
-bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
-{
- if (!m_menuBarFrame)
- return TRUE;
+// ---------------------------------------------------------------------------
+// wxMenuBar construction
+// ---------------------------------------------------------------------------
- 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;
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
+{
+ wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
+ if ( !menuOld )
+ return NULL;
- if (m_menuBarFrame) {
- DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ;
- }
+ m_titles[pos] = title;
- return TRUE;
- }
+#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"));
+ }
+
+#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);
+ m_titles.Insert(title, pos);
- DrawMenuBar((HWND) m_menuBarFrame->GetHWND());
+ 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
+
+ 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)
- {
- delete[]m_menus;
- delete[]m_titles;
- }
- m_menus = new_menus;
- m_titles = new_titles;
+ m_titles.Add(title);
- m_menus[m_menuCount - 1] = (wxMenu *)menu;
- m_titles[m_menuCount - 1] = title;
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ if (IsAttached())
+#else
+ if (GetHmenu())
+#endif
+ {
+#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
+
+#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;
+ 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"));
+ }
+ }
+#else
+ if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) )
+ {
+ wxLogLastError(wxT("RemoveMenu"));
+ }
+#endif
- if (menu != 0) {
- for (ii = 0; ii < m_menuCount; ii++) {
- if (m_menus[ii] == menu)
- break;
- }
- if (ii >= m_menuCount)
- return;
- } else {
- if (ii < 0 || ii >= m_menuCount)
- return;
- menu = m_menus[ii];
- }
+#if wxUSE_ACCEL
+ if ( menu->HasAccels() )
+ {
+ // need to rebuild accell table
+ RebuildAccelTable();
+ }
+#endif // wxUSE_ACCEL
- if (!OnDelete(menu, ii))
- return;
+ if (IsAttached())
+ Refresh();
+ }
- menu->SetParent(NULL);
+ m_titles.RemoveAt(pos);
- -- m_menuCount;
- for (j = ii; j < m_menuCount; j++) {
- m_menus[j] = m_menus[j + 1];
- m_titles[j] = m_titles[j + 1];
- }
+ return menu;
}
-// Find the menu menuString, item itemString, and return the item id.
-// Returns -1 if none found.
-int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const
+#if wxUSE_ACCEL
+
+void wxMenuBar::RebuildAccelTable()
{
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)menuString, buf1);
- int i;
- for (i = 0; i < m_menuCount; i++)
+ // merge the accelerators of all menus into one accel table
+ size_t nAccelCount = 0;
+ size_t i, count = GetMenuCount();
+ wxMenuList::iterator it;
+ for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
{
- wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
- if (strcmp (buf1, buf2) == 0)
- return m_menus[i]->FindItem (itemString);
+ nAccelCount += (*it)->GetAccelCount();
}
- return -1;
-}
-wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const
-{
- if (itemMenu)
- *itemMenu = NULL;
+ if ( nAccelCount )
+ {
+ wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
- wxMenuItem *item = NULL;
- int i;
- for (i = 0; i < m_menuCount; i++)
- {
- item = m_menus[i]->FindItemForId (Id, itemMenu);
- if (item)
- return item;
- }
- return NULL;
+ nAccelCount = 0;
+ for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
+ {
+ nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
+ }
+
+ SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries));
+
+ delete [] accelEntries;
+ }
}
-void wxMenuBar::SetHelpString (int Id, const wxString& helpString)
+#endif // wxUSE_ACCEL
+
+void wxMenuBar::Attach(wxFrame *frame)
{
- int i;
- for (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)
{
- if (m_menus[i]->FindItemForId (Id))
- {
- m_menus[i]->SetHelpString (Id, helpString);
- return;
- }
+ if (m_hMenu)
+ {
+ if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0))
+ {
+ wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
+ }
+ }
}
+#endif
+
+#if wxUSE_ACCEL
+ RebuildAccelTable();
+#endif // wxUSE_ACCEL
}
-wxString wxMenuBar::GetHelpString (int Id) const
+#if defined(WINCE_WITH_COMMANDBAR)
+bool wxMenuBar::AddAdornments(long style)
{
- int i;
- for (i = 0; i < m_menuCount; i++)
+ if (m_adornmentsAdded || !m_commandBar)
+ return false;
+
+ if (style & wxCLOSE_BOX)
{
- if (m_menus[i]->FindItemForId (Id))
- return wxString(m_menus[i]->GetHelpString (Id));
+ if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))
+ {
+ wxLogLastError(wxT("CommandBar_AddAdornments"));
+ }
+ else
+ {
+ return true;
+ }
}
- return wxString("");
-}
-
-wxWindow *wxMenu::GetWindow() const
-{
- if ( m_pInvokingWindow != NULL )
- return m_pInvokingWindow;
- if ( m_menuBar != NULL)
- return m_menuBar->m_menuBarFrame;
- return NULL;
+ return false;
}
+#endif
-WXHMENU wxMenu::GetHMenu() const
+void wxMenuBar::Detach()
{
- if ( m_hMenu != 0 )
- return m_hMenu;
- else if ( m_savehMenu != 0 )
- return m_savehMenu;
-
- return 0;
+ wxMenuBarBase::Detach();
}
+#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff