diff options
| author | Doug McLain <doug@nostar.net> | 2011-02-15 18:02:50 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2011-02-15 18:02:50 +0000 |
| commit | 8d44c2b82a6334d1f0f00b7e174e061f83c9a441 (patch) | |
| tree | 8198ecd48f2b166e403dbdb0d089fcfd3d994ede /libs/gtkmm2ext/gtk_ui.cc | |
| parent | 4bd528798073c8e168e9f17df6246255f653e079 (diff) | |
Update rc files to use unique rc variable names, update wscript to use the names, and re-enable theme switching
git-svn-id: svn://localhost/ardour2/branches/3.0@8861 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtk_ui.cc')
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 035e892fba..a12bef593b 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -135,9 +135,7 @@ UI::load_rcfile (string path, bool themechange) * This does not occur if wiget.get_style is used instead of rc.get_style below, * except that doesn't actually work... */ - if (themechange) { - return 0; //Disable theme change completely till we figure this out... - } + static Glib::RefPtr<Style>* fatal_style = 0; static Glib::RefPtr<Style>* error_style = 0; static Glib::RefPtr<Style>* warning_style = 0; @@ -155,10 +153,10 @@ UI::load_rcfile (string path, bool themechange) return -1; } - 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()); + 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(); |