--- gigedit/trunk/src/gigedit/main.cpp	2017/11/14 18:07:25	3364
+++ gigedit/trunk/src/gigedit/main.cpp	2019/03/03 09:08:20	3489
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 - 2017 Andreas Persson
+ * Copyright (C) 2006 - 2019 Andreas Persson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -26,42 +26,6 @@
 # include <gtkmm.h>
 #endif
 
-#if GTKMM_MAJOR_VERSION >= 3
-
-/**
- * This is required since GTK 3, because those GTK super heros came up with
- * the clever idea to simply disable things like icons and keyboard shortcuts
- * for menus and for buttons by default for all users, all devices and all
- * apps. Yey! Seriously, I have no idea what came on their mind to find that
- * was a good idea!
- */
-static void enforceGtk3Settings(int argc, char* argv[]) {
-#if GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && (GTK_MINOR_VERSION > 89) || (GTK_MINOR_VERSION == 89 && GTK_MICRO_VERSION >= 3)) // GTK >= 3.89.3
-    gtk_init();
-#else
-    gtk_init(&argc, &argv);
-#endif
-
-    // got no behavior change on those 2 settings, so ignoring them for now,
-    // actually I though I could use them to show the mnemonics in the GTK 3
-    // menus again, but it seems that was entirely removed from around GTK 3.10.
-    //g_object_set(gtk_settings_get_default(), "gtk-auto-mnemonics", false, NULL);
-    //g_object_set(gtk_settings_get_default(), "gtk-can-change-accels", true, NULL);
-
-    // bring back keyboard accelerators with GTK 3
-    g_object_set(gtk_settings_get_default(), "gtk-enable-accels", true, NULL);
-    g_object_set(gtk_settings_get_default(), "gtk-enable-mnemonics", true, NULL);
-
-    // bring back icons with GTK 3
-    g_object_set(gtk_settings_get_default(), "gtk-menu-images", true, NULL);
-    g_object_set(gtk_settings_get_default(), "gtk-button-images", true, NULL);
-
-    // who knows ... one day those GTK "masterminds" decide to disable tooltips by default as well
-    g_object_set(gtk_settings_get_default(), "gtk-enable-tooltips", true, NULL);
-}
-
-#endif // GTKM 3
-
 #if defined(WIN32)
 #include <windows.h>
 
@@ -80,10 +44,6 @@
 
 int main(int argc, char* argv[])
 {
-    #if GTKMM_MAJOR_VERSION >= 3
-    enforceGtk3Settings(argc, argv);
-    #endif
-
 #ifdef __APPLE__
     // remove the argument added by the OS
     if (argc > 1 && strncmp(argv[1], "-psn", 4) == 0) {