From af8acbcc8879e3e3e158a92417578152627faf3b Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Sat, 7 Jul 2007 05:04:34 +0000
Subject: [PATCH] more show() stuff, and replaced strip->show_all(); untill its
 actually finished

git-svn-id: svn://localhost/ardour2/trunk@2124 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/gain_meter.cc    |  6 ++++++
 gtk2_ardour/mixer_strip.cc   | 13 ++++++++++---
 gtk2_ardour/mixer_ui.cc      |  1 +
 gtk2_ardour/processor_box.cc |  4 ++++
 gtk2_ardour/route_ui.cc      |  6 +++++-
 gtk2_ardour/utils.cc         |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index a1ecd8586d..0b56e7edec 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -217,6 +217,12 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 	ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
 
 	UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeter::on_theme_changed));
+
+	gain_display.show();
+	peak_display.show();
+	gain_display_box.show();
+	fader_box.show();
+	meter_metric_area.show();
 }
 
 void
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 6b8b256a7c..0a572fcd68 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -114,8 +114,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	comment_area = 0;
 	_width_owner = 0;
 
-	width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width")))));
-	hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
+	Gtk::Image *width_icon = manage (new Gtk::Image (::get_icon("strip_width")));
+	Gtk::Image *hide_icon = manage (new Gtk::Image (::get_icon("hide")));
+	width_button.add (*width_icon);
+	hide_button.add (*hide_icon);
 
 	input_label.set_text (_("Input"));
 	input_button.add (input_label);
@@ -355,7 +357,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	add_events (Gdk::BUTTON_RELEASE_MASK);
 
 	whvbox->show();
-	
+	hide_icon->show();
+	width_icon->show();
+
+	pre_processor_box.show();
 	hide_button.show();
 	width_button.show();
 	width_hide_box.show();
@@ -381,6 +386,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	speed_spinner.show();
 	speed_label.show();
 	speed_frame.show();
+
+	show();
 }
 
 MixerStrip::~MixerStrip ()
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index b2d0806609..48fd3ec223 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -619,6 +619,7 @@ Mixer_UI::redisplay_track_list ()
 					strip_packer.pack_start (*strip, false, false);
 				}
 				strip->set_packed (true);
+				strip->show_all();
 			}
 
 		} else {
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 756067e1e2..924b54f0ce 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -153,6 +153,10 @@ ProcessorBox::ProcessorBox (Placement pcmnt, Session& sess, boost::shared_ptr<Ro
 	/* now force an update of all the various elements */
 
 	redisplay_processors ();
+
+	processor_scroller.show();
+	processor_display.show();
+	show();
 }
 
 ProcessorBox::~ProcessorBox ()
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 277ec12879..f9325f5d68 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -108,13 +108,17 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
 		rec_enable_button = manage (new BindableToggleButton (*t->rec_enable_control().get(), r_name ));
 		rec_enable_button->set_name ("RecordEnableButton");
 		rec_enable_button->set_self_managed (true);
-
+		
+		rec_enable_button->show();
 		update_rec_display ();
 	} 
 
 	mute_button->unset_flags (Gtk::CAN_FOCUS);
 	solo_button->unset_flags (Gtk::CAN_FOCUS);
 	
+	mute_button->show();
+	solo_button->show();
+
 	_route->RemoteControlIDChanged.connect (mem_fun(*this, &RouteUI::refresh_remote_control_menu));
 
 	/* map the current state */
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 9747c3bcbb..83a95fb71f 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -108,7 +108,7 @@ fit_to_pixels (const ustring& str, int pixel_width, Pango::FontDescription& font
 gint
 just_hide_it (GdkEventAny *ev, Gtk::Window *win)
 {
-	win->hide_all ();
+	win->hide ();
 	return TRUE;
 }