From a903d9fe41669a7c3bb72bd42fd224734efcb12e Mon Sep 17 00:00:00 2001 From: carlh Date: Mon, 23 May 2011 10:03:04 +0000 Subject: [PATCH] Remove some unused code. git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@9570 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 30 ------------------------------ gtk2_ardour/ardour_ui.h | 3 --- gtk2_ardour/wscript | 2 -- gtk2_ardour/x11.cc | 11 ----------- 4 files changed, 46 deletions(-) delete mode 100644 gtk2_ardour/x11.cc diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 3864a2b58..088bff782 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -327,8 +327,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup)); stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown)); - - platform_setup (); } /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */ @@ -2272,34 +2270,6 @@ ARDOUR_UI::import_metadata () dialog.run (); } -void -ARDOUR_UI::fontconfig_dialog () -{ -#ifdef GTKOSX - /* X11 users will always have fontconfig info around, but new GTK-OSX users - may not and it can take a while to build it. Warn them. - */ - - std::string fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig"); - - if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) { - MessageDialog msg (*_startup, - string_compose (_("Welcome to %1.\n\n" - "The program will take a bit longer to start up\n" - "while the system fonts are checked.\n\n" - "This will only be done once, and you will\n" - "not see this message again\n"), PROGRAM_NAME), - true, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_OK); - pop_back_splash (); - msg.show_all (); - msg.present (); - msg.run (); - } -#endif -} - bool ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path) { diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 900cc6c3b..283bcbe91 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -692,9 +692,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void loading_message (const std::string& msg); void end_loading_messages (); - void platform_specific (); - void platform_setup (); - void fontconfig_dialog (); void toggle_translations (); PBD::ScopedConnectionList forever_connections; diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index c869ef919..a7467377e 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -348,8 +348,6 @@ def build(bld): TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ] obj.uselib_local += ' libappleutility ' - else: - obj.source += [ 'x11.cc' ] if bld.env['VST_SUPPORT']: # If we require VST support we build a stub main() and the FST library diff --git a/gtk2_ardour/x11.cc b/gtk2_ardour/x11.cc deleted file mode 100644 index 5c5d5c9ab..000000000 --- a/gtk2_ardour/x11.cc +++ /dev/null @@ -1,11 +0,0 @@ -#include "ardour_ui.h" - -void -ARDOUR_UI::platform_specific () -{ -} - -void -ARDOUR_UI::platform_setup () -{ -} -- 2.11.4.GIT