diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-14 21:49:43 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-14 21:49:43 +0000 |
| commit | 7a5b6a5031d4c573c90d2455276aa174a665239b (patch) | |
| tree | 5fe53c6eb77432eeb78d4a8b46dba9112e483885 /libs/gtkmm2ext/gtk_ui.cc | |
| parent | 7ac5d03cb870acb429b7fb0c315dd5774d4e0b8c (diff) | |
patches from lincoln to speed up the regionlist and provide region removal (causes dangling shared ptrs to regions, fix to come
git-svn-id: svn://localhost/ardour2/branches/3.0@8845 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtk_ui.cc')
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 9736569053..035e892fba 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -147,7 +147,7 @@ UI::load_rcfile (string path, bool themechange) return -1; } - if (access (path.c_str(), R_OK)) { + if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) { error << "UI: couldn't find rc file \"" << path << '"' @@ -155,12 +155,11 @@ UI::load_rcfile (string path, bool themechange) return -1; } - RC rc (path.c_str()); - gtk_rc_reset_styles (gtk_settings_get_default()); - //vector<string> files; - //files.push_back(path.c_str()); - //RC::set_default_files(files); - //RC::reparse_all (Gtk::Settings::get_default(), true); + RC rc (path.c_str()); + //this is buggy in gtkmm for some reason, so use C + //RC::reset_styles (Gtk::Settings::get_default()); + gtk_rc_reset_styles (gtk_settings_get_default()); + theme_changed.emit(); if (themechange) { |