Allow initializing wxWidgets multiple times against one instance of GTK+, episode 3

See #17751
2016-12-18 08:11:59 -08:00
parent aac66ea877
commit e0bcae1257
2 changed files with 13 additions and 1 deletions
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -1024,6 +1024,11 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule);
 void wxSystemSettingsModule::OnExit()
 {
 #ifdef __WXGTK3__
+    GtkSettings* settings = gtk_settings_get_default();
+    g_signal_handlers_disconnect_by_func(settings,
+        (void*)notify_gtk_theme_name, NULL);
+    g_signal_handlers_disconnect_by_func(settings,
+        (void*)notify_gtk_font_name, NULL);
 #else
    if (gs_tlw_parent)
        gtk_widget_destroy(gs_tlw_parent);