#endif
#include "wx/scopedarray.h"
+#include "wx/vector.h"
#include "wx/msw/private.h"
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
// ----------------------------------------------------------------------------
// the (popup) menu title has this special id
-static const UINT idMenuTitle = (UINT)-3;
+static const int idMenuTitle = wxID_NONE;
// ----------------------------------------------------------------------------
-// private functions
+// private helper classes and functions
// ----------------------------------------------------------------------------
+// Contains the data about the radio items groups in the given menu.
+class wxMenuRadioItemsData
+{
+public:
+ wxMenuRadioItemsData() { }
+
+ // Default copy ctor, assignment operator and dtor are all ok.
+
+ // Find the start and end of the group containing the given position or
+ // return false if it's not inside any range.
+ bool GetGroupRange(int pos, int *start, int *end) const
+ {
+ // We use a simple linear search here because there are not that many
+ // items in a menu and hence even fewer radio items ranges anyhow, so
+ // normally there is no need to do anything fancy (like keeping the
+ // array sorted and using binary search).
+ for ( Ranges::const_iterator it = m_ranges.begin();
+ it != m_ranges.end();
+ ++it )
+ {
+ const Range& r = *it;
+
+ if ( r.start <= pos && pos <= r.end )
+ {
+ if ( start )
+ *start = r.start;
+ if ( end )
+ *end = r.end;
+
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ // Take into account the new radio item about to be added at the given
+ // position.
+ //
+ // Returns true if this item starts a new radio group, false if it extends
+ // an existing one.
+ bool UpdateOnInsert(int pos)
+ {
+ bool inExistingGroup = false;
+
+ for ( Ranges::iterator it = m_ranges.begin();
+ it != m_ranges.end();
+ ++it )
+ {
+ Range& r = *it;
+
+ if ( pos < r.start )
+ {
+ // Item is inserted before this range, update its indices.
+ r.start++;
+ r.end++;
+ }
+ else if ( pos <= r.end + 1 )
+ {
+ // Item is inserted in the middle of this range or immediately
+ // after it in which case it extends this range so make it span
+ // one more item in any case.
+ r.end++;
+
+ inExistingGroup = true;
+ }
+ //else: Item is inserted after this range, nothing to do for it.
+ }
+
+ if ( inExistingGroup )
+ return false;
+
+ // Make a new range for the group this item will belong to.
+ Range r;
+ r.start = pos;
+ r.end = pos;
+ m_ranges.push_back(r);
+
+ return true;
+ }
+
+private:
+ // Contains the inclusive positions of the range start and end.
+ struct Range
+ {
+ int start;
+ int end;
+ };
+
+ typedef wxVector<Range> Ranges;
+ Ranges m_ranges;
+};
+
namespace
{
{
wxLogLastError(wxT("SetMenuItemInfo"));
}
-#endif
+#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__
+ 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__
}
#ifdef __WXWINCE__
}
#endif // __WXWINCE__
-bool IsLessThanStdSize(const wxBitmap& bmp)
+inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
{
- // FIXME: these +4 are chosen so that 16*16 bitmaps pass this test with
- // default SM_CXMENUCHECK value but I have no idea what do we really
- // need to use here
- return bmp.GetWidth() < ::GetSystemMetrics(SM_CXMENUCHECK) + 4 &&
- bmp.GetHeight() < ::GetSystemMetrics(SM_CYMENUCHECK) + 4;
+ return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
+ bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
}
} // anonymous namespace
// implementation
// ============================================================================
-#include "wx/listimpl.cpp"
-
-WX_DEFINE_LIST( wxMenuInfoList )
-
-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_FLAGS( wxMenuStyle )
-
-wxBEGIN_FLAGS( wxMenuStyle )
- wxFLAGS_MEMBER(wxMENU_TEAROFF)
-wxEND_FLAGS( wxMenuStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler,"wx/menu.h")
-
-wxCOLLECTION_TYPE_INFO( wxMenuItem * , wxMenuItemList ) ;
-
-template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVariantArray &value)
-{
- wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList , value ) ;
-}
-
-wxBEGIN_PROPERTIES_TABLE(wxMenu)
- wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
- wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
- wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
- wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxMenu)
-wxEND_HANDLERS_TABLE()
-
-wxDIRECT_CONSTRUCTOR_2( wxMenu , wxString , Title , long , MenuStyle )
-
-WX_DEFINE_FLAGS( wxMenuBarStyle )
-
-wxBEGIN_FLAGS( wxMenuBarStyle )
- wxFLAGS_MEMBER(wxMB_DOCKABLE)
-wxEND_FLAGS( wxMenuBarStyle )
-
-// the negative id would lead the window (its superclass !) to vetoe streaming out otherwise
-bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxWriter * , wxPersister * , wxxVariantArray & )
-{
- return true ;
-}
-
-IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarStreamingCallback)
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject , "wx/menu.h" )
-
-wxBEGIN_PROPERTIES_TABLE(wxMenuInfo)
- wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxREADONLY_PROPERTY( Title , wxString , GetTitle , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxMenuInfo)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title )
-
-wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ;
-
-template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, wxxVariantArray &value)
-{
- wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList , value ) ;
-}
-
-wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
- wxPROPERTY_COLLECTION( MenuInfos , wxMenuInfoList , wxMenuInfo* , Append , GetMenuInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxMenuBar)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_DUMMY( wxMenuBar )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
-#endif
-
-const wxMenuInfoList& wxMenuBar::GetMenuInfos() const
-{
- wxMenuInfoList* list = const_cast< wxMenuInfoList* >( &m_menuInfos ) ;
- WX_CLEAR_LIST( wxMenuInfoList , *list ) ;
- for( size_t i = 0 ; i < GetMenuCount() ; ++i )
- {
- wxMenuInfo* info = new wxMenuInfo() ;
- info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetMenuLabel(i) ) ;
- list->Append( info ) ;
- }
- return m_menuInfos ;
-}
-
// ---------------------------------------------------------------------------
// wxMenu construction, adding and removing menu items
// ---------------------------------------------------------------------------
// Construct a menu with optional title (then use append)
-void wxMenu::Init()
+void wxMenu::InitNoCreate()
{
+ m_radioData = NULL;
m_doBreak = false;
- m_startRadioGroup = -1;
+
+#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 we have a title, insert it in the beginning of the menu
if ( !m_title.empty() )
{
- Append(idMenuTitle, m_title);
- AppendSeparator();
+ 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));
}
}
// delete accels
WX_CLEAR_ARRAY(m_accels);
#endif // wxUSE_ACCEL
+
+ delete m_radioData;
}
void wxMenu::Break()
m_doBreak = true;
}
-void wxMenu::Attach(wxMenuBarBase *menubar)
-{
- wxMenuBase::Attach(menubar);
-
- EndRadioGroup();
-}
-
#if wxUSE_ACCEL
int wxMenu::FindAccel(int id) const
{
GetMenuBar()->RebuildAccelTable();
}
+
+ ResetMaxAccelWidth();
}
//else: it is a separator, they can't have accels, nothing to do
}
} // anonymous namespace
+bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const
+{
+ return m_radioData && m_radioData->GetGroupRange(pos, start, end);
+}
+
// append a new item or submenu to the menu
bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
{
pos = GetMenuItemCount() - 1;
}
- // adjust position to account for the title, if any
- if ( !m_title.empty() )
+ // 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. Later we might want to use a boolean in the
- // wxMenu to avoid search. Also we might make this fix unnecessary by
- // getting the correct margin using NONCLIENTMETRICS.
- static const wxWinVersion winver = wxGetWinVersion();
- if ( winver < wxWinVersion_XP &&
- !pItem->IsOwnerDrawn() && !pItem->IsSeparator() )
- {
- // Check if any other items are ownerdrawn, and make ownerdrawn if so
- wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
- while (node)
- {
- if (node->GetData()->IsOwnerDrawn())
- {
- pItem->SetOwnerDrawn(true);
- break;
- }
- node = node->GetNext();
- }
- }
+ // 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 ( pItem->IsOwnerDrawn() )
{
#ifndef __DMC__
- // 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
- 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() && !IsLessThanStdSize(bmpUnchecked)) ||
- (bmpChecked.Ok() && !IsLessThanStdSize(bmpChecked)) )
- {
- mustUseOwnerDrawn = true;
- }
- }
- // use InsertMenuItem() if possible as it's guaranteed to look correct
- // while our owner-drawn code is not
- if ( !mustUseOwnerDrawn )
+ if ( !m_ownerDrawn && !pItem->IsSeparator() )
{
- 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() )
+ // 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 )
{
- mii.fMask |= MIIM_CHECKMARKS;
- mii.hbmpChecked = GetHBitmapForMenu(pItem, true);
- mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false);
+ const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
+ bmpChecked = pItem->GetBitmap(true);
+
+ if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked)) ||
+ (bmpChecked.IsOk() && IsGreaterThanStdSize(bmpChecked)) )
+ {
+ mustUseOwnerDrawn = true;
+ }
}
- else if ( pItem->GetBitmap().IsOk() )
+
+ // use InsertMenuItem() if possible as it's guaranteed to look
+ // correct while our owner-drawn code is not
+ if ( !mustUseOwnerDrawn )
{
- mii.fMask |= MIIM_BITMAP;
- mii.hbmpItem = GetHBitmapForMenu(pItem);
- }
+ WinStruct<MENUITEMINFO> mii;
+ mii.fMask = MIIM_STRING | MIIM_DATA;
- mii.cch = itemText.length();
- mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());
+ // 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);
+ }
- if ( flags & MF_POPUP )
- {
- mii.fMask |= MIIM_SUBMENU;
- mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());
- }
- else
- {
- mii.fMask |= MIIM_ID;
- mii.wID = id;
- }
+ mii.cch = itemText.length();
+ mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());
- mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
+ if ( flags & MF_POPUP )
+ {
+ mii.fMask |= MIIM_SUBMENU;
+ mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());
+ }
+ else
+ {
+ mii.fMask |= MIIM_ID;
+ mii.wID = id;
+ }
- 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 )
+ mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
+
+ ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
+ if ( !ok )
{
- mi.fMask = MIM_STYLE;
- mi.dwStyle = MNS_CHECKORBMP;
- if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
+ 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 )
{
- wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
+ 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);
+ // 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__
// 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
}
+ // Check the item if it should be initially checked.
+ if ( checkInitially )
+ pItem->Check(true);
+
// if we just appended the title, highlight it
- if ( id == idMenuTitle )
+ if ( id == (UINT_PTR)idMenuTitle )
{
// visually select the menu title
SetDefaultMenuItem(GetHmenu(), id);
return true;
}
-void wxMenu::EndRadioGroup()
-{
- // we're not inside a radio group any longer
- m_startRadioGroup = -1;
-}
-
wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
{
- wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") );
-
- bool check = false;
-
- if ( item->GetKind() == wxITEM_RADIO )
- {
- int count = GetMenuItemCount();
-
- if ( m_startRadioGroup == -1 )
- {
- // start a new radio group
- m_startRadioGroup = count;
-
- // for now it has just one element
- item->SetAsRadioGroupStart();
- item->SetRadioGroupEnd(m_startRadioGroup);
-
- // ensure that we have a checked item in the radio group
- check = true;
- }
- else // extend the current radio group
- {
- // we need to update its end item
- item->SetRadioGroupStart(m_startRadioGroup);
- wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
-
- if ( node )
- {
- node->GetData()->SetRadioGroupEnd(count);
- }
- else
- {
- wxFAIL_MSG( wxT("where is the radio group start item?") );
- }
- }
- }
- else // not a radio item
- {
- EndRadioGroup();
- }
-
- if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
- {
- return NULL;
- }
-
- if ( check )
- {
- // check the item initially
- item->Check(true);
- }
-
- return item;
+ return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item) ? item : NULL;
}
wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
delete m_accels[n];
m_accels.RemoveAt(n);
+
+ ResetMaxAccelWidth();
}
//else: this item doesn't have an accel, nothing to do
#endif // wxUSE_ACCEL
#endif // wxUSE_ACCEL
+// ---------------------------------------------------------------------------
+// ownerdrawn helpers
+// ---------------------------------------------------------------------------
+
+#if wxUSE_OWNER_DRAWN
+
+void wxMenu::CalculateMaxAccelWidth()
+{
+ wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
+
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem* item = node->GetData();
+
+ if ( item->IsOwnerDrawn() )
+ {
+ int width = item->MeasureAccelWidth();
+ if (width > m_maxAccelWidth )
+ m_maxAccelWidth = width;
+ }
+
+ node = node->GetNext();
+ }
+}
+
+#endif // wxUSE_OWNER_DRAWN
+
// ---------------------------------------------------------------------------
// set wxMenu title
// ---------------------------------------------------------------------------
if ( !label.empty() )
{
if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
- idMenuTitle, m_title.wx_str()) ||
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) ||
!::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
{
wxLogLastError(wxT("InsertMenu"));
#else
if ( !ModifyMenu(hMenu, 0u,
MF_BYPOSITION | MF_STRING,
- idMenuTitle, m_title.wx_str()) )
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) )
{
wxLogLastError(wxT("ModifyMenu"));
}
// put the title string in bold face
if ( !m_title.empty() )
{
- SetDefaultMenuItem(GetHmenu(), idMenuTitle);
+ SetDefaultMenuItem(GetHmenu(), (UINT_PTR)idMenuTitle);
}
#endif // Win32
}
const int id = (signed short)id_;
// ignore commands from the menu title
- if ( id != (int)idMenuTitle )
+ if ( id != idMenuTitle )
{
// update the check item when it's clicked
wxMenuItem * const item = FindItem(id);
return true;
}
-// ---------------------------------------------------------------------------
-// other
-// ---------------------------------------------------------------------------
-
-wxWindow *wxMenu::GetWindow() const
+// get the menu with given handle (recursively)
+wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)
{
- if ( m_invokingWindow != NULL )
- return m_invokingWindow;
- else if ( GetMenuBar() != NULL)
- return GetMenuBar()->GetFrame();
+ // check self
+ if ( GetHMenu() == hMenu )
+ return this;
+
+ // recursively query submenus
+ for ( size_t n = 0 ; n < GetMenuItemCount(); ++n )
+ {
+ wxMenuItem* item = FindItemByPosition(n);
+ wxMenu* submenu = item->GetSubMenu();
+ if ( submenu )
+ {
+ submenu = submenu->MSWGetMenu(hMenu);
+ if (submenu)
+ return submenu;
+ }
+ }
+ // unknown hMenu
return NULL;
}
{
Init();
- m_titles.Alloc(count);
-
for ( size_t i = 0; i < count; i++ )
{
+ // We just want to store the menu title in the menu itself, not to
+ // show it as a dummy item in the menu itself as we do with the popup
+ // menu titles in overridden wxMenu::SetTitle().
+ menus[i]->wxMenuBase::SetTitle(titles[i]);
m_menus.Append(menus[i]);
- m_titles.Add(titles[i]);
menus[i]->Attach(this);
}
}
else
{
- size_t count = GetMenuCount(), i;
- wxMenuList::iterator it;
- for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
+ 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(),
- m_titles[i].wx_str()) )
+ (*it)->GetTitle().wx_str()) )
{
wxLogLastError(wxT("AppendMenu"));
}
{
wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
- m_titles[pos] = label;
+ m_menus[pos]->wxMenuBase::SetTitle(label);
if ( !IsAttached() )
{
wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
- return m_titles[pos];
+ return m_menus[pos]->GetTitle();
}
// ---------------------------------------------------------------------------
if ( !menuOld )
return NULL;
- m_titles[pos] = title;
+ menu->wxMenuBase::SetTitle(title);
#if defined(WINCE_WITHOUT_COMMANDBAR)
if (IsAttached())
if ( !wxMenuBarBase::Insert(pos, menu, title) )
return false;
- m_titles.Insert(title, pos);
+ menu->wxMenuBase::SetTitle(title);
if ( isAttached )
{
if ( !wxMenuBarBase::Append(menu, title) )
return false;
- m_titles.Add(title);
+ menu->wxMenuBase::SetTitle(title);
#if defined(WINCE_WITHOUT_COMMANDBAR)
if (IsAttached())
Refresh();
}
- m_titles.RemoveAt(pos);
-
return menu;
}
wxMenuBarBase::Detach();
}
+// get the menu with given handle (recursively)
+wxMenu* wxMenuBar::MSWGetMenu(WXHMENU hMenu)
+{
+ wxCHECK_MSG( GetHMenu() != hMenu, NULL,
+ wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") );
+
+ // query all menus
+ for ( size_t n = 0 ; n < GetMenuCount(); ++n )
+ {
+ wxMenu* menu = GetMenu(n)->MSWGetMenu(hMenu);
+ if ( menu )
+ return menu;
+ }
+
+ // unknown hMenu
+ return NULL;
+}
+
#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff