remove "New Return" menu option from processor box; make return toggle processor...

[ardour.git] / gtk2_ardour / splash.cc

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 893ecc3d2c7cfa29dcd1df78b558db68dc8ab183..bba754dc108f07afbdca8e432d7bbeabfac21605 100644 (file)
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -1,9 +1,9 @@
 #include <string>
 
-#include <pbd/failed_constructor.h>
-#include <pbd/file_utils.h>
-#include <ardour/ardour.h>
-#include <ardour/filesystem_paths.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/file_utils.h"
+#include "ardour/ardour.h"
+#include "ardour/filesystem_paths.h"
 
 #include "gui_thread.h"
 #include "splash.h"
@@ -12,6 +12,7 @@
 
 using namespace Gtk;
 using namespace Glib;
+using namespace PBD;
 using namespace std;
 using namespace ARDOUR;
 
@@ -21,7 +22,7 @@ Splash::Splash ()
 {
        sys::path splash_file;
 
-       if (!find_file_in_search_path (ardour_search_path(), "splash.png", splash_file)) {
+       if (!find_file_in_search_path (ardour_search_path() + system_data_search_path(), "splash.png", splash_file)) {
                throw failed_constructor();
        }
 
@@ -32,7 +33,7 @@ Splash::Splash ()
        catch (...) {
                throw failed_constructor();
        }
-       
+
        darea.set_size_request (pixbuf->get_width(), pixbuf->get_height());
        set_keep_above (true);
        set_position (WIN_POS_CENTER);
@@ -74,7 +75,7 @@ Splash::on_realize ()
 
 
 bool
-Splash::on_button_release_event (GdkEventButton* ev)
+Splash::on_button_release_event (GdkEventButton*)
 {
        hide ();
        return true;
@@ -92,10 +93,10 @@ Splash::expose (GdkEventExpose* ev)
        window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
                             ev->area.x, ev->area.y,
                             ev->area.x, ev->area.y,
-                            min ((pixbuf->get_width() - ev->area.x), ev->area.width), 
+                            min ((pixbuf->get_width() - ev->area.x), ev->area.width),
                             min ((pixbuf->get_height() - ev->area.y), 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();
 
@@ -118,10 +119,11 @@ Splash::message (const string& msg)
        str += "</b>";
 
        layout->set_markup (str);
-       darea.queue_draw ();
-       
        Glib::RefPtr<Gdk::Window> win = darea.get_window();
+
        if (win) {
+               win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30,
+                                                     darea.get_width(), 30), true);
                win->process_updates (true);
                gdk_flush ();
        }