BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-29 01:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

tray: linux fix tray menu elements not running callbacks (#13626)

Browse source
This commit is contained in:
Hayden Gray 2025-08-03 10:22:32 -04:00 • committed by GitHub
parent e1a623f129
commit cb5436045d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/unix/SDL_gtk.c
View file

@ -223,5 +223,6 @@ void SDL_UpdateGtk(void)
{
if (IsGtkInit()) {
gtk.g.main_context_iteration(sdl_main_context, GTK_FALSE);
gtk.g.main_context_iteration(NULL, GTK_FALSE);
}
}

2
src/core/unix/SDL_gtk.h
View file

@ -74,7 +74,7 @@ typedef struct _GtkSettings GtkSettings;
typedef struct SDL_GtkContext
{
/* Glib 2.0 */
struct
struct
{
gulong (*signal_connect)(gpointer instance, const gchar *detailed_signal, void *c_handler, gpointer data);
gulong (*signal_connect_data)(gpointer instance, const gchar *detailed_signal, GCallback c_handler, gpointer data, GClosureNotify destroy_data, SDL_GConnectFlags connect_flags);

4
src/tray/unix/SDL_tray.c
View file

@ -166,7 +166,7 @@ struct SDL_Tray {
GtkMenuShell *menu_cached;
};
static void call_callback(GtkMenuItem *item, GParamSpec *pspec, gpointer ptr)
static void call_callback(GtkMenuItem *item, gpointer ptr)
{
SDL_TrayEntry *entry = ptr;
@ -404,7 +404,7 @@ SDL_TrayMenu *SDL_CreateTraySubmenu(SDL_TrayEntry *entry)
SDL_SetError("Cannot create submenu for entry not created with SDL_TRAYENTRY_SUBMENU");
return NULL;
}
SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (!gtk) {
return NULL;