From f59870b49f9af67dcf47cabac092ec87f25a446b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 30 Jul 2007 23:08:06 +0000 Subject: another minor fix for gtkmm breakage with Gtk::Settings::get_default() in not-entirely current gtkmm releases git-svn-id: svn://localhost/ardour2/trunk@2191 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/plugin_selector.cc | 4 ++-- libs/gtkmm2ext/gtk_ui.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 3604344831..82fb9c0393 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -168,9 +168,9 @@ PluginSelector::PluginSelector (PluginManager *mgr) table->attach (*filter_box, 0, 7, 5, 6, FILL|EXPAND, FILL, 5, 5); - table->attach(*btn_add, 1, 2, 6, 7, FILL, FILL, 5, 5); + table->attach(*btn_add, 1, 2, 6, 7, FILL, FILL, 5, 5); table->attach(*btn_remove, 3, 4, 6, 7, FILL, FILL, 5, 5); - table->attach(*btn_update, 5, 6, 7, 7, FILL, FILL, 5, 5); + table->attach(*btn_update, 5, 6, 7, 8, FILL, FILL, 5, 5); table->attach(ascroller, 0, 7, 8, 10); diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 3ac8e905d1..cf755873fd 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -129,7 +129,8 @@ UI::load_rcfile (string path, bool themechange) } RC rc (path.c_str()); - RC::reset_styles(Gtk::Settings::get_default()); + // RC::reset_styles (Gtk::Settings::get_default()); + gtk_rc_reset_styles (gtk_settings_get_default()); theme_changed.emit(); if (themechange) { -- cgit v1.2.3