mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-11 03:10:09 +00:00
Prevent concurrent use of GTK+ 2 and 3
If we detect a gtk2-only symbol, error out early.
This commit is contained in:
parent
32dd5882a0
commit
2a2843c041
@ -607,6 +607,22 @@ setlocale_initialization (void)
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
check_mixed_deps (void)
|
||||
{
|
||||
GModule *module;
|
||||
gpointer func;
|
||||
|
||||
module = g_module_open (NULL, 0);
|
||||
|
||||
if (g_module_symbol (module, "gtk_progress_get_type", &func))
|
||||
{
|
||||
g_error ("GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported");
|
||||
}
|
||||
|
||||
g_module_close (module);
|
||||
}
|
||||
|
||||
static void
|
||||
do_pre_parse_initialization (int *argc,
|
||||
char ***argv)
|
||||
@ -618,6 +634,8 @@ do_pre_parse_initialization (int *argc,
|
||||
|
||||
pre_initialized = TRUE;
|
||||
|
||||
check_mixed_deps ();
|
||||
|
||||
gdk_pre_parse_libgtk_only ();
|
||||
gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user