// Not needed, included in defs.h
// #include "wx/windowid.h"
-#define wxTRACE_WINDOWID _T("windowid")
+#define wxTRACE_WINDOWID wxT("windowid")
namespace
{
// so it should never be reserved, but test anyway
if(gs_autoIdsRefCount[id] == ID_RESERVED)
{
- wxASSERT_MSG(false, wxT("reserve id being decreased"));
+ wxFAIL_MSG(wxT("reserve id being decreased"));
gs_autoIdsRefCount[id] = ID_FREE;
}
else
while(count--)
ReserveIdRefCount(id--);
- return id;
+ return id + 1;
}
}
else
}
}
- ::wxLogError(_("Out of window IDs. Recommend shutting down application."));
+ wxLogError(_("Out of window IDs. Recommend shutting down application."));
return wxID_NONE;
#else // !wxUSE_AUTOID_MANAGEMENT
// Make sure enough in the range