Use int instead of wxWindowID in wxNewId() and friends.
The functions are available in wxBase builds too, but wx/windowid.h isn't. Rather than always including that header, just use int, for which wxWindowID is a typedef. This keeps the functions available in wxBase for compatibility and is consistent with how IDs are handled in other parts of wxBase, particularly wxEvent. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -273,13 +273,13 @@ inline bool wxPlatformIs(int platform) { return wxPlatform::Is(platform); }
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Ensure subsequent IDs don't clash with this one
|
||||
WXDLLIMPEXP_BASE void wxRegisterId(wxWindowID id);
|
||||
WXDLLIMPEXP_BASE void wxRegisterId(int id);
|
||||
|
||||
// Return the current ID
|
||||
WXDLLIMPEXP_BASE wxWindowID wxGetCurrentId();
|
||||
WXDLLIMPEXP_BASE int wxGetCurrentId();
|
||||
|
||||
// Generate a unique ID
|
||||
WXDLLIMPEXP_BASE wxWindowID wxNewId();
|
||||
WXDLLIMPEXP_BASE int wxNewId();
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Various conversions
|
||||
|
Reference in New Issue
Block a user