add text entry cursor color to dark theme

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e8aee1cdbe686a954b7757bd573778a25426d867..ef35ac64b493811dbc0cdba3059bfe404ae4ffdd 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -18,14 +18,19 @@
 */
 
 #include <cstdlib>
-#include <signal.h>
 #include <cerrno>
-#include <fstream>
 #include <vector>
 
+#include <signal.h>
+#include <locale.h>
+
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
+#ifdef HAVE_FFTW35F
+#include <fftw3.h>
+#endif
+
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 #include "pbd/textreceiver.h"
@@ -270,6 +275,8 @@ extern "C" {
 
 int ardour_main (int argc, char *argv[])
 
+#elif defined NOMAIN
+int nomain (int argc, char *argv[])
 #else
 int main (int argc, char *argv[])
 #endif
@@ -284,8 +291,12 @@ int main (int argc, char *argv[])
                Glib::thread_init();
        }
 
+#ifdef HAVE_FFTW35F
+       fftwf_make_planner_thread_safe ();
+#endif
+
 #ifdef ENABLE_NLS
-       gtk_set_locale ();
+       setlocale (LC_ALL, "");
 #endif
 
        console_madness_begin();
@@ -368,11 +379,13 @@ int main (int argc, char *argv[])
        }
 #endif
 
+       DEBUG_TRACE (DEBUG::Locale, string_compose ("main() locale '%1'\n", setlocale (LC_NUMERIC, NULL)));
+
        if (UIConfiguration::instance().pre_gui_init ()) {
                error << _("Could not complete pre-GUI initialization") << endmsg;
                exit (1);
        }
-       
+
        try {
                ui = new ARDOUR_UI (&argc, &argv, localedir.c_str());
        } catch (failed_constructor& err) {