Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with the user-defined ids

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-01-18 14:15:54 +00:00
parent fb96cf856e
commit 9249d38d6e
9 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/tbarbase.h
View File

@@ -76,7 +76,7 @@ public:
m_tbar = tbar;
m_id = toolid;
if (m_id == wxID_ANY)
m_id = wxNewId();
m_id = wxWindow::NewControlId();
m_clientData = clientData;
m_bmpNormal = bmpNormal;

8
include/wx/timer.h
View File

@@ -51,8 +51,12 @@ public:
// same as ctor above
void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY)
{ m_owner = owner; m_idTimer = timerid == wxID_ANY ? wxNewId() : timerid; }
wxEvtHandler * GetOwner() const { return m_owner; }
{
m_owner = owner;
m_idTimer = timerid == wxID_ANY ? wxWindow::NewControlId() : timerid;
}
wxEvtHandler *GetOwner() const { return m_owner; }
virtual ~wxTimerBase();

2
include/wx/xrc/xmlres.h
View File

@@ -223,7 +223,7 @@ public:
// resource. If an unknown str_id is requested (i.e. other than wxID_XXX
// or integer), a new record is created which associates the given string
// with a number. If value_if_not_found == wxID_NONE, the number is obtained via
// wxNewId(). Otherwise value_if_not_found is used.
// wxWindow::NewControlId(). Otherwise value_if_not_found is used.
// Macro XRCID(name) is provided for convenient use in event tables.
static int GetXRCID(const wxChar *str_id, int value_if_not_found = wxID_NONE);