From 4f607df3d27983fb1a7ea3e534c2143898de177a Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 16 Dec 2016 23:40:19 -0800 Subject: [PATCH] Revert 21c1c552, "Allow initializing wxWidgets multiple times" See #17751 --- src/gtk/settings.cpp | 5 ----- src/gtk/win_gtk.cpp | 4 ---- 2 files changed, 9 deletions(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index a11dcb3041..ff8c06fb1e 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -972,10 +972,5 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule); void wxSystemSettingsModule::OnExit() { - 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); } #endif diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 3415327452..49f0b348dc 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -334,10 +334,6 @@ GType wxPizza::type() static GType type; if (type == 0) { - type = g_type_from_name("wxPizza"); - if (type) - return type; - const GTypeInfo info = { sizeof(wxPizzaClass), NULL, NULL,