89511b4268
Previously the radio menu items could only be appended to a menu in wxMSW, inserting them (either in an existing radio group or to start a new one) not only didn't work but could even result in crashes because invalid iterators in the menu items list could be used. Fix this by storing the ranges of all radio groups in wxMenu itself instead of storing the information about the radio group an item belongs to in the item itself and by updating this data whenever a new radio item is inserted. Also get rid of the notion of "current radio group" in wxMenu which doesn't really make any sense. Finally add a unit test checking that inserting radio items works as expected. Closes #13200. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
140 lines
4.2 KiB
C++
140 lines
4.2 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/menuitem.h
|
|
// Purpose: wxMenuItem class
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 11.11.97
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _MENUITEM_H
|
|
#define _MENUITEM_H
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if wxUSE_OWNER_DRAWN
|
|
#include "wx/ownerdrw.h"
|
|
#include "wx/bitmap.h"
|
|
|
|
struct tagRECT;
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
|
|
#if wxUSE_OWNER_DRAWN
|
|
, public wxOwnerDrawn
|
|
#endif
|
|
{
|
|
public:
|
|
// ctor & dtor
|
|
wxMenuItem(wxMenu *parentMenu = NULL,
|
|
int id = wxID_SEPARATOR,
|
|
const wxString& name = wxEmptyString,
|
|
const wxString& help = wxEmptyString,
|
|
wxItemKind kind = wxITEM_NORMAL,
|
|
wxMenu *subMenu = NULL);
|
|
virtual ~wxMenuItem();
|
|
|
|
// override base class virtuals
|
|
virtual void SetItemLabel(const wxString& strName);
|
|
|
|
virtual void Enable(bool bDoEnable = true);
|
|
virtual void Check(bool bDoCheck = true);
|
|
virtual bool IsChecked() const;
|
|
|
|
// unfortunately needed to resolve ambiguity between
|
|
// wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
|
|
bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); }
|
|
|
|
// the id for a popup menu is really its menu handle (as required by
|
|
// ::AppendMenu() API), so this function will return either the id or the
|
|
// menu handle depending on what we are
|
|
//
|
|
// notice that it also returns the id as an unsigned int, as required by
|
|
// Win32 API
|
|
WXWPARAM GetMSWId() const;
|
|
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
// compatibility only, don't use in new code
|
|
wxDEPRECATED(
|
|
wxMenuItem(wxMenu *parentMenu,
|
|
int id,
|
|
const wxString& text,
|
|
const wxString& help,
|
|
bool isCheckable,
|
|
wxMenu *subMenu = NULL)
|
|
);
|
|
#endif
|
|
|
|
#if wxUSE_OWNER_DRAWN
|
|
|
|
void SetBitmaps(const wxBitmap& bmpChecked,
|
|
const wxBitmap& bmpUnchecked = wxNullBitmap)
|
|
{
|
|
m_bmpChecked = bmpChecked;
|
|
m_bmpUnchecked = bmpUnchecked;
|
|
SetOwnerDrawn(true);
|
|
}
|
|
|
|
void SetBitmap(const wxBitmap& bmp, bool bChecked = true)
|
|
{
|
|
if ( bChecked )
|
|
m_bmpChecked = bmp;
|
|
else
|
|
m_bmpUnchecked = bmp;
|
|
SetOwnerDrawn(true);
|
|
}
|
|
|
|
void SetDisabledBitmap(const wxBitmap& bmpDisabled)
|
|
{
|
|
m_bmpDisabled = bmpDisabled;
|
|
SetOwnerDrawn(true);
|
|
}
|
|
|
|
const wxBitmap& GetBitmap(bool bChecked = true) const
|
|
{ return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
|
|
|
|
const wxBitmap& GetDisabledBitmap() const
|
|
{ return m_bmpDisabled; }
|
|
|
|
int MeasureAccelWidth() const;
|
|
|
|
// override wxOwnerDrawn base class virtuals
|
|
virtual wxString GetName() const;
|
|
virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight);
|
|
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
|
|
|
|
protected:
|
|
virtual void GetFontToUse(wxFont& font) const;
|
|
virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const;
|
|
|
|
private:
|
|
// helper function for draw std menu check mark
|
|
void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat);
|
|
|
|
#endif // wxUSE_OWNER_DRAWN
|
|
|
|
private:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
|
|
#if wxUSE_OWNER_DRAWN
|
|
// item bitmaps
|
|
wxBitmap m_bmpChecked, // bitmap to put near the item
|
|
m_bmpUnchecked, // (checked is used also for 'uncheckable' items)
|
|
m_bmpDisabled;
|
|
#endif // wxUSE_OWNER_DRAWN
|
|
|
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem)
|
|
};
|
|
|
|
#endif //_MENUITEM_H
|