Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / widget_canvaschooser.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
index c2ab9c0..568c4b0 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
@@ -34,6 +34,8 @@
 #include <gtkmm/menu.h>
 #include "app.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -60,21 +62,21 @@ Widget_CanvasChooser::~Widget_CanvasChooser()
 }
 
 void
-Widget_CanvasChooser::set_parent_canvas(etl::handle<synfig::Canvas> x)
+Widget_CanvasChooser::set_parent_canvas(synfig::Canvas::Handle x)
 {
        assert(x);
        parent_canvas=x;
 }
 
 void
-Widget_CanvasChooser::set_value_(etl::handle<synfig::Canvas> data)
+Widget_CanvasChooser::set_value_(synfig::Canvas::Handle data)
 {
        set_value(data);
        activate();
 }
 
 void
-Widget_CanvasChooser::set_value(etl::handle<synfig::Canvas> data)
+Widget_CanvasChooser::set_value(synfig::Canvas::Handle data)
 {
        assert(parent_canvas);
        canvas=data;
@@ -144,16 +146,17 @@ Widget_CanvasChooser::chooser_menu()
                set_value_(canvas);
                return;
        }
-               
+
        Canvas::Handle new_canvas;
        try
        {
-               new_canvas=parent_canvas->find_canvas(canvas_name);
+               String warnings;
+               new_canvas=parent_canvas->find_canvas(canvas_name, warnings);
                set_value_(new_canvas);
        }
        catch(std::runtime_error x)
        {
-               App::dialog_error_blocking(_("Error:Exception Thrown"),x.what());
+               App::dialog_error_blocking(_("Error:Exception Thrown"),String(_("Error selecting canvas:\n\n")) + x.what());
                set_value_(canvas);
        }
        catch(...)