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

diff --git a/docs/changes.txt b/docs/changes.txt
index d4ffa596829ff19a7975a671623903e9f38d0c3f..ac1bb2f7121d70e09be8ce39dd7c57962d302807 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -122,6 +122,11 @@ All (GUI):
 - added wxStatusBar support to XRC (Brian Ravnsgaard Riis)
 - wxMenu::Append and etc. return a pointer to the wxMenuItem that was
   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:
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 76260c94fb64e05b6ad58cc7a5363fff08a2358a..c59c71ee437dd055a8a002be1f2ac0906b1433c7 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1418,7 +1418,7 @@ enum
 /*  id for a separator line in the menu (invalid for normal item) */
 enum
 {
-    wxID_SEPARATOR = -1
+    wxID_SEPARATOR = -2
 };
 
 /*  Standard menu IDs */

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 16344e72f4416b9816fbd41a39e047c943fabe45..299a018e2392021ffc6e1956fb531d228dc37be1 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -79,6 +79,8 @@ public:
     {
         m_tbar = tbar;
         m_id = toolid;
+        if (m_id == wxID_ANY)
+            m_id = wxNewId();
         m_clientData = clientData;
 
         m_bmpNormal = bmpNormal;

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 4cca372c6207905350c3b3b5b30b97ed899f66a4..3b2c9d37aac659c8df4e8ceaed4f70217cf93537 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -72,6 +72,10 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
     m_isChecked   = FALSE;
     m_id          = id;
     m_kind        = kind;
+    if (m_id == wxID_ANY)
+        m_id = wxNewId();
+    if (m_id == wxID_SEPARATOR)
+        m_kind = wxITEM_SEPARATOR;
 }
 
 wxMenuItemBase::~wxMenuItemBase()