Using a -1 (wxID_ANY) for menu or toolbar item IDs will now generate a
new ID for the item using wxNewId(). As a consequence of this, the value of wxID_SEPARATOR was changed from -1 to -2 in order to not clash. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -122,6 +122,11 @@ All (GUI):
|
|||||||
- added wxStatusBar support to XRC (Brian Ravnsgaard Riis)
|
- added wxStatusBar support to XRC (Brian Ravnsgaard Riis)
|
||||||
- wxMenu::Append and etc. return a pointer to the wxMenuItem that was
|
- wxMenu::Append and etc. return a pointer to the wxMenuItem that was
|
||||||
added or inserted, or NULL on failure.
|
added or inserted, or NULL on failure.
|
||||||
|
- Using a -1 (wxID_ANY) for menu or toolbar item IDs will now generate
|
||||||
|
a new ID for the item using wxNewId(). As a consequence of this,
|
||||||
|
the value of wxID_SEPARATOR was changed from -1 to -2 in order to
|
||||||
|
not clash.
|
||||||
|
|
||||||
|
|
||||||
wxMSW:
|
wxMSW:
|
||||||
|
|
||||||
|
@@ -1418,7 +1418,7 @@ enum
|
|||||||
/* id for a separator line in the menu (invalid for normal item) */
|
/* id for a separator line in the menu (invalid for normal item) */
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
wxID_SEPARATOR = -1
|
wxID_SEPARATOR = -2
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Standard menu IDs */
|
/* Standard menu IDs */
|
||||||
|
@@ -79,6 +79,8 @@ public:
|
|||||||
{
|
{
|
||||||
m_tbar = tbar;
|
m_tbar = tbar;
|
||||||
m_id = toolid;
|
m_id = toolid;
|
||||||
|
if (m_id == wxID_ANY)
|
||||||
|
m_id = wxNewId();
|
||||||
m_clientData = clientData;
|
m_clientData = clientData;
|
||||||
|
|
||||||
m_bmpNormal = bmpNormal;
|
m_bmpNormal = bmpNormal;
|
||||||
|
@@ -72,6 +72,10 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
|
|||||||
m_isChecked = FALSE;
|
m_isChecked = FALSE;
|
||||||
m_id = id;
|
m_id = id;
|
||||||
m_kind = kind;
|
m_kind = kind;
|
||||||
|
if (m_id == wxID_ANY)
|
||||||
|
m_id = wxNewId();
|
||||||
|
if (m_id == wxID_SEPARATOR)
|
||||||
|
m_kind = wxITEM_SEPARATOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxMenuItemBase::~wxMenuItemBase()
|
wxMenuItemBase::~wxMenuItemBase()
|
||||||
|
Reference in New Issue
Block a user