#include <gtkmm/menu.h>
#include "app.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
}
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;
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(...)