callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GDK: Avoid using constructors on Win32

Browse Source 
The constructors in GDK only have a meaning for UNIX, on Windows
they are useless.
This commit is contained in:
Luca Bacci 2022-03-03 14:07:48 +01:00
parent ef4e1c473c
commit d53b6b858f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdk/gdk.c
View File

@ -1132,7 +1132,8 @@ gdk_unichar_direction (gunichar ch)
return PANGO_DIRECTION_LTR; return PANGO_DIRECTION_LTR;
} }
#ifdef G_HAS_CONSTRUCTORS #if defined (G_HAS_CONSTRUCTORS) && !defined (G_OS_WIN32)
#define GDK_USE_CONSTRUCTORS
#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_startup_id) #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_startup_id)
#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_autostart_id) #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_autostart_id)
@ -1175,7 +1176,7 @@ gdk_get_desktop_startup_id (void)
if (g_once_init_enter (&init)) if (g_once_init_enter (&init))
{ {
#ifndef G_HAS_CONSTRUCTORS #ifndef GDK_USE_CONSTRUCTORS
stash_startup_id (); stash_startup_id ();
#endif #endif
/* Clear the environment variable so it won't be inherited by /* Clear the environment variable so it won't be inherited by
@ -1196,7 +1197,7 @@ gdk_get_desktop_autostart_id (void)
if (g_once_init_enter (&init)) if (g_once_init_enter (&init))
{ {
#ifndef G_HAS_CONSTRUCTORS #ifndef GDK_USE_CONSTRUCTORS
stash_autostart_id (); stash_autostart_id ();
#endif #endif
/* Clear the environment variable so it won't be inherited by /* Clear the environment variable so it won't be inherited by