summaryrefslogtreecommitdiff
path: root/libs/gtkmm2ext/gtk_ui.cc
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2011-02-14 01:46:57 +0000
committerDoug McLain <doug@nostar.net>2011-02-14 01:46:57 +0000
commitd4dd6fbe63b258443a5f3bcd3e0281c91d0dea48 (patch)
tree34e50e04718914ed5ab77fea1f850f2f84ab4ce7 /libs/gtkmm2ext/gtk_ui.cc
parent7e7dd8e85a34efe884f3e8d061a7c8e2f0b9b927 (diff)
Make light theme functional, add waf processing, and small change to UI::load_rcfile() that fixes a hang when switching between two rc files that are identical in style defs
git-svn-id: svn://localhost/ardour2/branches/3.0@8839 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtk_ui.cc')
-rw-r--r--libs/gtkmm2ext/gtk_ui.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index dcce6b6c28..4a4b282b1f 100644
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -153,9 +153,10 @@ UI::load_rcfile (string path, bool themechange)
return -1;
}
- RC rc (path.c_str());
- //RC::reset_styles (Gtk::Settings::get_default());
- 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);
theme_changed.emit();
if (themechange) {