mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-01-07 05:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL_GetTrayEntries(): Rename parameter size to count

Browse Source
This commit is contained in:
Petar Popovic
2025-02-05 14:04:15 +01:00
committed by Sam Lantinga
parent b99e19c0a2
commit 68dabd48c4
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/SDL3/SDL_tray.h
View File

@@ -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.

6
src/tray/cocoa/SDL_tray.m
View File

@@ -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;
}

2
src/tray/dummy/SDL_tray.c
View File

@@ -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;

6
src/tray/unix/SDL_tray.c
View File

@@ -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;
}

6
src/tray/windows/SDL_tray.c
View File

@@ -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;
}