Store the result of wxWindow::NewControlId() in wxWindowIDRef.

The result of calling NewControlId() must be assigned to wxWindowIDRef to be
accounted for correctly, otherwise the id was marked as free while a reference
to it still existed resulting in asserts in id management code when we
attempted to reuse it.

Closes #11604.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-07-23 23:32:56 +00:00
parent a5bb451448
commit 2c83a950a4

View File

@@ -652,13 +652,13 @@ public:
// MyCanvas
// ----------------------------------------------------------------------------
const wxWindowID ID_ADDBUTTON = wxWindow::NewControlId();
const wxWindowID ID_DELBUTTON = wxWindow::NewControlId();
const wxWindowID ID_MOVEBUTTON = wxWindow::NewControlId();
const wxWindowID ID_SCROLLWIN = wxWindow::NewControlId();
const wxWindowID ID_QUERYPOS = wxWindow::NewControlId();
const wxWindowIDRef ID_ADDBUTTON = wxWindow::NewControlId();
const wxWindowIDRef ID_DELBUTTON = wxWindow::NewControlId();
const wxWindowIDRef ID_MOVEBUTTON = wxWindow::NewControlId();
const wxWindowIDRef ID_SCROLLWIN = wxWindow::NewControlId();
const wxWindowIDRef ID_QUERYPOS = wxWindow::NewControlId();
const wxWindowID ID_NEWBUTTON = wxWindow::NewControlId();
const wxWindowIDRef ID_NEWBUTTON = wxWindow::NewControlId();
BEGIN_EVENT_TABLE(MyCanvas, wxScrolled<wxPanel>)
EVT_PAINT( MyCanvas::OnPaint)