summaryrefslogtreecommitdiff
path: root/gtk2_ardour/gain_meter.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-08-26 23:25:44 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-08-26 23:25:44 +0000
commit1526735d7925bf07f7a6c3378a87bf559e11050a (patch)
treee95c8086296e3b45b2b91579a8e588dc609ec0c9 /gtk2_ardour/gain_meter.cc
parentbdb84342381310f6162418e0603e7eeaabde20bd (diff)
some (unfinished) work on incorporating Ben's rev 6919 changes regarding track selection; make newly selected tracks show the current range selection; fix crashes related to meter display; remove "all" group from main group tab display and just put it down in its own button (totally incomplete); minor cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@7696 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
-rw-r--r--gtk2_ardour/gain_meter.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 9ae59f63e6..1bc9dc3f79 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -92,7 +92,6 @@ GainMeterBase::GainMeterBase (Session* s,
ignore_toggle = false;
meter_menu = 0;
next_release_selects = false;
- style_changed = true;
_width = Wide;
if (horizontal) {
@@ -915,12 +914,8 @@ GainMeter::render_metrics (Gtk::Widget& w)
gint
GainMeter::meter_metrics_expose (GdkEventExpose *ev)
{
- static Glib::RefPtr<Gtk::Style> meter_style;
- if (style_changed) {
- meter_style = meter_metric_area.get_style();
- }
Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
- Glib::RefPtr<Gdk::GC> bg_gc (meter_style->get_bg_gc (Gtk::STATE_INSENSITIVE));
+ Glib::RefPtr<Gdk::GC> bg_gc (meter_metric_area.get_style()->get_bg_gc (Gtk::STATE_INSENSITIVE));
GdkRectangle base_rect;
GdkRectangle draw_rect;
gint width, height;