diff --git a/include/SDL3/SDL_tray.h b/include/SDL3/SDL_tray.h index c096e003fb..4343c9efde 100644 --- a/include/SDL3/SDL_tray.h +++ b/include/SDL3/SDL_tray.h @@ -250,7 +250,7 @@ extern SDL_DECLSPEC SDL_TrayMenu * SDLCALL SDL_GetTraySubmenu(SDL_TrayEntry *ent * Returns a list of entries in the menu, in order. * * \param menu The menu to get entries from. - * \param size An optional pointer to obtain the number of entries in the + * \param count An optional pointer to obtain the number of entries in the * menu. * \returns a NULL-terminated list of entries within the given menu. The * pointer becomes invalid when any function that inserts or deletes @@ -264,7 +264,7 @@ extern SDL_DECLSPEC SDL_TrayMenu * SDLCALL SDL_GetTraySubmenu(SDL_TrayEntry *ent * \sa SDL_RemoveTrayEntry * \sa SDL_InsertTrayEntryAt */ -extern SDL_DECLSPEC const SDL_TrayEntry ** SDLCALL SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size); +extern SDL_DECLSPEC const SDL_TrayEntry ** SDLCALL SDL_GetTrayEntries(SDL_TrayMenu *menu, int *count); /** * Removes a tray entry. diff --git a/src/tray/cocoa/SDL_tray.m b/src/tray/cocoa/SDL_tray.m index ae8d6be835..fd7f95517c 100644 --- a/src/tray/cocoa/SDL_tray.m +++ b/src/tray/cocoa/SDL_tray.m @@ -285,15 +285,15 @@ SDL_TrayMenu *SDL_GetTraySubmenu(SDL_TrayEntry *entry) return entry->submenu; } -const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size) +const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *count) { if (!menu) { SDL_InvalidParamError("menu"); return NULL; } - if (size) { - *size = menu->nEntries; + if (count) { + *count = menu->nEntries; } return (const SDL_TrayEntry **)menu->entries; } diff --git a/src/tray/dummy/SDL_tray.c b/src/tray/dummy/SDL_tray.c index db76db2526..766fb92584 100644 --- a/src/tray/dummy/SDL_tray.c +++ b/src/tray/dummy/SDL_tray.c @@ -66,7 +66,7 @@ SDL_TrayMenu *SDL_GetTraySubmenu(SDL_TrayEntry *entry) return NULL; } -const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size) +const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *count) { SDL_InvalidParamError("menu"); return NULL; diff --git a/src/tray/unix/SDL_tray.c b/src/tray/unix/SDL_tray.c index 5f017c2f59..f10f92aa4e 100644 --- a/src/tray/unix/SDL_tray.c +++ b/src/tray/unix/SDL_tray.c @@ -540,15 +540,15 @@ SDL_TrayMenu *SDL_GetTraySubmenu(SDL_TrayEntry *entry) return entry->submenu; } -const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size) +const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *count) { if (!menu) { SDL_InvalidParamError("menu"); return NULL; } - if (size) { - *size = menu->nEntries; + if (count) { + *count = menu->nEntries; } return (const SDL_TrayEntry **)menu->entries; } diff --git a/src/tray/windows/SDL_tray.c b/src/tray/windows/SDL_tray.c index 32b5e85c56..18008ee298 100644 --- a/src/tray/windows/SDL_tray.c +++ b/src/tray/windows/SDL_tray.c @@ -367,15 +367,15 @@ SDL_TrayMenu *SDL_GetTraySubmenu(SDL_TrayEntry *entry) return entry->submenu; } -const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size) +const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *count) { if (!menu) { SDL_InvalidParamError("menu"); return NULL; } - if (size) { - *size = menu->nEntries; + if (count) { + *count = menu->nEntries; } return (const SDL_TrayEntry **)menu->entries; }