Maybe negative wxWindowId are better than just -1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
0de9b5b23f
commit
69418a8e47
@ -170,7 +170,7 @@ public:
|
|||||||
|
|
||||||
// generate a control id for the controls which were not given one by
|
// generate a control id for the controls which were not given one by
|
||||||
// user
|
// user
|
||||||
static int NewControlId() { return ++ms_lastControlId; }
|
static int NewControlId() { return --ms_lastControlId; }
|
||||||
|
|
||||||
// moving/resizing
|
// moving/resizing
|
||||||
// ---------------
|
// ---------------
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
// static data
|
// static data
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
int wxWindowBase::ms_lastControlId = 0;
|
int wxWindowBase::ms_lastControlId = -2;
|
||||||
|
|
||||||
IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
|
IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
|
||||||
|
|
||||||
@ -152,8 +152,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
|
|||||||
wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") );
|
wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") );
|
||||||
|
|
||||||
// generate a new id if the user doesn't care about it
|
// generate a new id if the user doesn't care about it
|
||||||
// No, we keep the -1 from now on. RR.
|
m_windowId = id == -1 ? NewControlId() : id;
|
||||||
// m_windowId = id == -1 ? NewControlId() : id;
|
|
||||||
|
|
||||||
SetName(name);
|
SetName(name);
|
||||||
SetWindowStyleFlag(style);
|
SetWindowStyleFlag(style);
|
||||||
|
Loading…
Reference in New Issue
Block a user