Merge with trunk R2978.

git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 7 deletions

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 404c5c64a0..9317ec1caa 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -29,14 +29,19 @@ Splash::Splash ()
 	catch (...) {
 		throw failed_constructor();
 	}
-
+	
 	darea.set_size_request (pixbuf->get_width(), pixbuf->get_height());
-	set_type_hint (Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
 	set_keep_above (true);
 	set_position (WIN_POS_CENTER);
 	darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
 
 	layout = create_pango_layout ("");
+	string str = "<b>";
+	string i18n = _("Ardour loading ...");
+	str += i18n;
+	str += "</b>";
+
+	layout->set_markup (str);
 
 	darea.show ();
 	darea.signal_expose_event().connect (mem_fun (*this, &Splash::expose));
@@ -48,6 +53,7 @@ void
 Splash::on_realize ()
 {
 	Window::on_realize ();
+	get_window()->set_decorations (Gdk::WMDecoration(0));
 	layout->set_font_description (get_style()->get_font());
 }
 
@@ -62,21 +68,19 @@ Splash::on_button_release_event (GdkEventButton* ev)
 bool
 Splash::expose (GdkEventExpose* ev)
 {
-#if 0
 	RefPtr<Gdk::Window> window = darea.get_window();
-	
-	Glib::RefPtr<Gtk::Style> style = darea.get_style();
 
-	window->draw_pixbuf (darea.get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
+	window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
 			     ev->area.x, ev->area.y,
 			     ev->area.x, ev->area.y,
 			     ev->area.width, ev->area.height,
 			     Gdk::RGB_DITHER_NONE, 0, 0);
 
+	Glib::RefPtr<Gtk::Style> style = darea.get_style();
 	Glib::RefPtr<Gdk::GC> white = style->get_white_gc();
 
 	window->draw_layout (white, 10, pixbuf->get_height() - 30, layout);
-#endif
+
 	return true;
 }